diff options
| author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2014-06-17 17:05:36 +1000 |
|---|---|---|
| committer | Patrick Georgi <patrick@georgi-clan.de> | 2014-06-21 08:07:22 +0200 |
| commit | a173a6255b5c3b7febea5cdf581fc3a57299954a (patch) | |
| tree | 836bff5c5e36419761ad736d3686b1384673f982 /src/mainboard | |
| parent | 9107e53756e158cf2b5803862b731577407265d5 (diff) | |
| download | coreboot-a173a6255b5c3b7febea5cdf581fc3a57299954a.tar.xz | |
Remove guarding #includes by CONFIG_FOO combinations
First of many to remove guarding the inclusion of headers based on
CONFIG_ options. This *potentially* could hide issues such as functions
being swapped from under our feet, since different runtime behaviour
could be declared with the function same name and type-signature. Hence,
depending on the header we happen to get may change runtime behaviour.
Change-Id: Ife56801c783c44e1882abef711e09b85b7f295a4
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6055
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/google/stout/i915.c | 2 | ||||
| -rw-r--r-- | src/mainboard/intel/cougar_canyon2/mainboard.c | 2 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x201/mainboard.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/src/mainboard/google/stout/i915.c b/src/mainboard/google/stout/i915.c index 4ebd567efe..3c1e672d91 100644 --- a/src/mainboard/google/stout/i915.c +++ b/src/mainboard/google/stout/i915.c @@ -6,9 +6,7 @@ #include <device/pci_ops.h> #include <console/console.h> #include <delay.h> -#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL)&&CONFIG_PCI_OPTION_ROM_RUN_YABEL #include <x86emu/x86emu.h> -#endif #include <pc80/mc146818rtc.h> #include <arch/acpi.h> #include <arch/io.h> diff --git a/src/mainboard/intel/cougar_canyon2/mainboard.c b/src/mainboard/intel/cougar_canyon2/mainboard.c index e7dda026dd..c51abedfd4 100644 --- a/src/mainboard/intel/cougar_canyon2/mainboard.c +++ b/src/mainboard/intel/cougar_canyon2/mainboard.c @@ -25,9 +25,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> -#endif #include <pc80/mc146818rtc.h> #include <arch/acpi.h> #include <arch/io.h> diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c index 786d5606e7..db36a88737 100644 --- a/src/mainboard/lenovo/x201/mainboard.c +++ b/src/mainboard/lenovo/x201/mainboard.c @@ -40,10 +40,8 @@ #include "dock.h" #include "hda_verb.h" #include <arch/x86/include/arch/acpigen.h> -#if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE #include <x86emu/regs.h> #include <arch/interrupt.h> -#endif #include <pc80/keyboard.h> #include <cpu/x86/lapic.h> #include <device/pci.h> |