Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo...

[~andy/linux] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 9f45e2f77d531748016db6799a39fcd7465b6ab9..9e00c389e777d95d43abf84836a901f1a7a4e3e2 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -346,6 +346,20 @@ config AB8500_BM
        help
          Say Y to include support for AB8500 battery management.
 
+config BATTERY_GOLDFISH
+       tristate "Goldfish battery driver"
+       depends on GENERIC_HARDIRQS
+       help
+         Say Y to enable support for the battery and AC power in the
+         Goldfish emulator.
+
+config CHARGER_PM2301
+       bool "PM2301 Battery Charger Driver"
+       depends on AB8500_BM
+       help
+         Say Y to include support for PM2301 charger driver.
+         Depends on AB8500 battery management core.
+
 source "drivers/power/reset/Kconfig"
 
 endif # POWER_SUPPLY