summaryrefslogtreecommitdiffstats
path: root/drivers/power/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-06 09:04:32 +0100
committerIngo Molnar <mingo@elte.hu>2009-01-06 09:04:32 +0100
commitd12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch)
treeac94d5bf58360b89fc7439fb52182c17d0674b0a /drivers/power/Kconfig
parentx86: cleanup remaining cpumask_t ops in smpboot code (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm (diff)
downloadlinux-d12418fdeafdc08dd5bbec89d3e07e47ee75da55.tar.xz
linux-d12418fdeafdc08dd5bbec89d3e07e47ee75da55.zip
Merge branch 'linus' into cpus4096
Diffstat (limited to 'drivers/power/Kconfig')
-rw-r--r--drivers/power/Kconfig14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 8e0c2b47803c..668472405a57 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -29,6 +29,13 @@ config APM_POWER
Say Y here to enable support APM status emulation using
battery class devices.
+config WM8350_POWER
+ tristate "WM8350 PMU support"
+ depends on MFD_WM8350
+ help
+ Say Y here to enable support for the power management unit
+ provided by the Wolfson Microelectronics WM8350 PMIC.
+
config BATTERY_DS2760
tristate "DS2760 battery driver (HP iPAQ & others)"
select W1
@@ -68,4 +75,11 @@ config BATTERY_BQ27x00
help
Say Y here to enable support for batteries with BQ27200(I2C) chip.
+config BATTERY_DA9030
+ tristate "DA9030 battery driver"
+ depends on PMIC_DA903X
+ help
+ Say Y here to enable support for batteries charger integrated into
+ DA9030 PMIC.
+
endif # POWER_SUPPLY