git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
drivers
/
power
/
Kconfig
diff --git
a/drivers/power/Kconfig
b/drivers/power/Kconfig
index
bf14672
..
22f2fa9
100644
(file)
--- 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.
Say Y here to enable support APM status emulation using
battery class devices.
+config MAX8925_POWER
+ tristate "MAX8925 battery charger support"
+ depends on MFD_MAX8925
+ help
+ Say Y here to enable support for the battery charger in the Maxim
+ MAX8925 PMIC.
+
config WM831X_BACKUP
tristate "WM831X backup battery charger support"
depends on MFD_WM831X
config WM831X_BACKUP
tristate "WM831X backup battery charger support"
depends on MFD_WM831X
@@
-118,6
+125,12
@@
config BATTERY_MAX17040
in handheld and portable equipment. The MAX17040 is configured
to operate with a single lithium cell
in handheld and portable equipment. The MAX17040 is configured
to operate with a single lithium cell
+config BATTERY_Z2
+ tristate "Z2 battery driver"
+ depends on I2C && MACH_ZIPIT2
+ help
+ Say Y to include support for the battery on the Zipit Z2.
+
config CHARGER_PCF50633
tristate "NXP PCF50633 MBC"
depends on MFD_PCF50633
config CHARGER_PCF50633
tristate "NXP PCF50633 MBC"
depends on MFD_PCF50633