X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Facpi%2FKconfig;h=a858bc528ec34b13e989a05ea7037029ace182e9;hb=d5b4a3d0efa36de31b86d5677dad6c36cb8735d7;hp=574259476fbf82263e9f72efe77562ce2d232cd6;hpb=d96a2a5c6479342229416565944b56bc7a2b1a60;p=pandora-kernel.git

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 574259476fbf..a858bc528ec3 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -71,6 +71,7 @@ config ACPI_PROCFS
 config ACPI_PROC_EVENT
 	bool "Deprecated /proc/acpi/event support"
 	depends on PROC_FS
+	default y
 	---help---
 	  A user-space daemon, acpi, typically read /proc/acpi/event
 	  and handled all ACPI sub-system generated events.
@@ -78,13 +79,16 @@ config ACPI_PROC_EVENT
 	  These events are now delivered to user-space via
 	  either the input layer, or as netlink events.
 
-	  This build option enables the old code for for legacy
+	  This build option enables the old code for legacy
 	  user-space implementation.  After some time, this will
 	  be moved under CONFIG_ACPI_PROCFS, and then deleted.
 
+	  Say Y here to retain the old behaviour.  Say N if your
+	  user-space is newer than kernel 2.6.23 (September 2007).
+
 config ACPI_AC
 	tristate "AC Adapter"
-	depends on X86
+	depends on X86 && POWER_SUPPLY
 	default y
 	help
 	  This driver adds support for the AC Adapter object, which indicates
@@ -93,7 +97,7 @@ config ACPI_AC
 
 config ACPI_BATTERY
 	tristate "Battery"
-	depends on X86
+	depends on X86 && POWER_SUPPLY
 	default y
 	help
 	  This driver adds support for battery information through
@@ -345,12 +349,11 @@ config ACPI_HOTPLUG_MEMORY
 		$>modprobe acpi_memhotplug 
 
 config ACPI_SBS
-	tristate "Smart Battery System (EXPERIMENTAL)"
+	tristate "Smart Battery System"
 	depends on X86
-	depends on EXPERIMENTAL
+	depends on POWER_SUPPLY
 	help
-	  This driver adds support for the Smart Battery System.
-	  A "Smart Battery" is quite old and quite rare compared
-	  to today's ACPI "Control Method" battery.
+	  This driver adds support for the Smart Battery System, another
+	  type of access to battery information, found on some laptops.
 
 endif	# ACPI