Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1300124f authored by Adrian Bunk's avatar Adrian Bunk Committed by Len Brown
Browse files

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: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 683aa401

arch/ia64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ choice 
config IA64_GENERIC

	bool "generic"

	select ACPI

	select PCI

	select NUMA

	select ACPI_NUMA

	help

arch/x86_64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/acpi/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -10,9 +10,8 @@ menu "ACPI (Advanced Configuration and Power Interface) Support" 
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