diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-02 21:05:04 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-02 21:05:04 -0500 |
| commit | db50342205deabaff9ce1fbe53d5ba351992fa08 (patch) | |
| tree | d8c948480080b8e845efd1fb36c5c57a167a4755 /drivers/acpi | |
| parent | 7ac2735462349ca35d8807d93d66cf4d9ea7b729 (diff) | |
ACPI: prevent build failure when CONFIG_X86_NUMAQ=y
...by disabling CONFIG_ACPI when CONFIG_X86_NUMAQ=y
otherwise arch/i386/pci/Makefile forgets
that it needs to build acpi.o
drivers/built-in.o: In function `acpi_pci_root_add':
pci_root.c:(.text+0x45ec4): undefined reference to `pci_acpi_scan_root'
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index f4f000abc4e9..b61a0632b351 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | menu "ACPI (Advanced Configuration and Power Interface) Support" | 5 | menu "ACPI (Advanced Configuration and Power Interface) Support" |
| 6 | depends on !X86_NUMAQ | ||
| 6 | depends on !X86_VISWS | 7 | depends on !X86_VISWS |
| 7 | depends on !IA64_HP_SIM | 8 | depends on !IA64_HP_SIM |
| 8 | depends on IA64 || X86 | 9 | depends on IA64 || X86 |