X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Facpi%2FKconfig;h=8fcae6df0a4236a12d486dc2d8b6fa6288001769;hb=929c6dd4195f6b4daf9887da34b3d7fbd0f2e2f5;hp=92ed9692c47e8f63e4f5bae061f2ed29e62b4e76;hpb=43b18db8a27fcd28c2bd290adf031ca04ea573ce;p=~andy%2Flinux

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 92ed9692c47..8fcae6df0a4 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -334,7 +334,7 @@ config X86_PM_TIMER
 
 config ACPI_CONTAINER
 	bool "Container and Module Devices"
-	default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU || ACPI_HOTPLUG_IO)
+	default (ACPI_HOTPLUG_MEMORY || ACPI_HOTPLUG_CPU)
 	help
 	  This driver supports ACPI Container and Module devices (IDs
 	  ACPI0004, PNP0A05, and PNP0A06).
@@ -345,9 +345,8 @@ config ACPI_CONTAINER
 	  the module will be called container.
 
 config ACPI_HOTPLUG_MEMORY
-	tristate "Memory Hotplug"
+	bool "Memory Hotplug"
 	depends on MEMORY_HOTPLUG
-	default n
 	help
 	  This driver supports ACPI memory hotplug.  The driver
 	  fields notifications on ACPI memory devices (PNP0C80),
@@ -396,7 +395,7 @@ config ACPI_CUSTOM_METHOD
 
 config ACPI_BGRT
 	bool "Boottime Graphics Resource Table support"
-	depends on EFI
+	depends on EFI && X86
         help
 	  This driver adds support for exposing the ACPI Boottime Graphics
 	  Resource Table, which allows the operating system to obtain