From: Adrian Bunk <bunk@xxxxxxxxx>
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@xxxxxxxxx>
Cc: "Brown, Len" <len.brown@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/ia64/Kconfig | 1 +
arch/x86_64/Kconfig | 1 +
drivers/acpi/Kconfig | 3 +--
3 files changed, 3 insertions(+), 2 deletions(-)
diff -puN arch/ia64/Kconfig~acpi-should-depend-on-not-select-pci arch/ia64/Kconfig
--- devel/arch/ia64/Kconfig~acpi-should-depend-on-not-select-pci 2006-03-28 14:03:06.000000000 -0800
+++ devel-akpm/arch/ia64/Kconfig 2006-03-28 14:03:06.000000000 -0800
@@ -77,6 +77,7 @@ choice
config IA64_GENERIC
bool "generic"
select ACPI
+ select PCI
select NUMA
select ACPI_NUMA
help
diff -puN arch/x86_64/Kconfig~acpi-should-depend-on-not-select-pci arch/x86_64/Kconfig
--- devel/arch/x86_64/Kconfig~acpi-should-depend-on-not-select-pci 2006-03-28 14:03:06.000000000 -0800
+++ devel-akpm/arch/x86_64/Kconfig 2006-03-28 14:03:06.000000000 -0800
@@ -289,6 +289,7 @@ config X86_64_ACPI_NUMA
bool "ACPI NUMA detection"
depends on NUMA
select ACPI
+ select PCI
select ACPI_NUMA
default y
help
diff -puN drivers/acpi/Kconfig~acpi-should-depend-on-not-select-pci drivers/acpi/Kconfig
--- devel/drivers/acpi/Kconfig~acpi-should-depend-on-not-select-pci 2006-03-28 14:03:06.000000000 -0800
+++ devel-akpm/drivers/acpi/Kconfig 2006-03-28 14:03:06.000000000 -0800
@@ -10,9 +10,8 @@ menu "ACPI (Advanced Configuration and P
config ACPI
bool "ACPI Support"
depends on IA64 || X86
+ depends on PCI
select PM
- select PCI
-
default y
---help---
Advanced Configuration and Power Interface (ACPI) support for
_
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
