diff options
| author | Adrian Bunk <bunk@stusta.de> | 2006-03-28 17:04:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-04-01 21:07:42 -0500 |
| commit | 1300124f69cafc54331bc06e968a8dd67863f989 (patch) | |
| tree | 4f94d162680b699f159d04a1bcc6d793f3b8a23c /arch | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
ACPI: Kconfig: ACPI should depend on, not select PCI
Otherwise, illegal configurations like X86_VOYAGER=y, PCI=y are
possible.
This patch also fixes the options select'ing ACPI to also select PCI.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86_64/Kconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index edffe25a477a..0046020e73b7 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
| @@ -77,6 +77,7 @@ choice | |||
| 77 | config IA64_GENERIC | 77 | config IA64_GENERIC |
| 78 | bool "generic" | 78 | bool "generic" |
| 79 | select ACPI | 79 | select ACPI |
| 80 | select PCI | ||
| 80 | select NUMA | 81 | select NUMA |
| 81 | select ACPI_NUMA | 82 | select ACPI_NUMA |
| 82 | help | 83 | help |
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 4310b4a311a5..299d8740177a 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig | |||
| @@ -289,6 +289,7 @@ config X86_64_ACPI_NUMA | |||
| 289 | bool "ACPI NUMA detection" | 289 | bool "ACPI NUMA detection" |
| 290 | depends on NUMA | 290 | depends on NUMA |
| 291 | select ACPI | 291 | select ACPI |
| 292 | select PCI | ||
| 292 | select ACPI_NUMA | 293 | select ACPI_NUMA |
| 293 | default y | 294 | default y |
| 294 | help | 295 | help |