aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-10-10 00:30:19 -0400
committerLen Brown <len.brown@intel.com>2007-10-10 00:30:19 -0400
commite270051d9c6e5f0b31668ec1f0d864ab9920ffca (patch)
tree49c2a5fb6ca6790f9cf070b49552388dadc7fa5b /drivers/acpi/Kconfig
parenta2883dfa2e4a94b24109b2bfe735561e50cc44b4 (diff)
parentd5b4a3d0efa36de31b86d5677dad6c36cb8735d7 (diff)
Pull battery-sbs-ac into release branch
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 9685b75898ed..b83389145f28 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -88,7 +88,7 @@ config ACPI_PROC_EVENT
88 88
89config ACPI_AC 89config ACPI_AC
90 tristate "AC Adapter" 90 tristate "AC Adapter"
91 depends on X86 91 depends on X86 && POWER_SUPPLY
92 default y 92 default y
93 help 93 help
94 This driver adds support for the AC Adapter object, which indicates 94 This driver adds support for the AC Adapter object, which indicates
@@ -97,7 +97,7 @@ config ACPI_AC
97 97
98config ACPI_BATTERY 98config ACPI_BATTERY
99 tristate "Battery" 99 tristate "Battery"
100 depends on X86 100 depends on X86 && POWER_SUPPLY
101 default y 101 default y
102 help 102 help
103 This driver adds support for battery information through 103 This driver adds support for battery information through
@@ -350,12 +350,11 @@ config ACPI_HOTPLUG_MEMORY
350 $>modprobe acpi_memhotplug 350 $>modprobe acpi_memhotplug
351 351
352config ACPI_SBS 352config ACPI_SBS
353 tristate "Smart Battery System (EXPERIMENTAL)" 353 tristate "Smart Battery System"
354 depends on X86 354 depends on X86
355 depends on EXPERIMENTAL 355 depends on POWER_SUPPLY
356 help 356 help
357 This driver adds support for the Smart Battery System. 357 This driver adds support for the Smart Battery System, another
358 A "Smart Battery" is quite old and quite rare compared 358 type of access to battery information, found on some laptops.
359 to today's ACPI "Control Method" battery.
360 359
361endif # ACPI 360endif # ACPI