diff options
| author | Len Brown <len.brown@intel.com> | 2007-10-10 00:30:19 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-10-10 00:30:19 -0400 |
| commit | e270051d9c6e5f0b31668ec1f0d864ab9920ffca (patch) | |
| tree | 49c2a5fb6ca6790f9cf070b49552388dadc7fa5b /drivers/acpi/Kconfig | |
| parent | a2883dfa2e4a94b24109b2bfe735561e50cc44b4 (diff) | |
| parent | d5b4a3d0efa36de31b86d5677dad6c36cb8735d7 (diff) | |
| download | kernel_samsung_espresso10-e270051d9c6e5f0b31668ec1f0d864ab9920ffca.zip kernel_samsung_espresso10-e270051d9c6e5f0b31668ec1f0d864ab9920ffca.tar.gz kernel_samsung_espresso10-e270051d9c6e5f0b31668ec1f0d864ab9920ffca.tar.bz2 | |
Pull battery-sbs-ac into release branch
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 9685b75..b833891 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -88,7 +88,7 @@ config ACPI_PROC_EVENT 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 @@ -97,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 @@ -350,12 +350,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 |