Merge tag 'for-3.8' of git://openrisc.net/~jonas/linux

[karo-tx-linux.git] / drivers / power / Kconfig

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index b1d956d81f0c341fc8f24a8c013e3ddc1d016079..9f45e2f77d531748016db6799a39fcd7465b6ab9 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -245,6 +245,13 @@ config BATTERY_INTEL_MID
          Say Y here to enable the battery driver on Intel MID
          platforms.
 
+config BATTERY_RX51
+       tristate "Nokia RX-51 (N900) battery driver"
+       depends on TWL4030_MADC
+       help
+         Say Y here to enable support for battery information on Nokia
+         RX-51, also known as N900 tablet.
+
 config CHARGER_ISP1704
        tristate "ISP1704 USB Charger Detection"
        depends on USB_OTG_UTILS
@@ -315,6 +322,16 @@ config CHARGER_MAX8998
          Say Y to enable support for the battery charger control sysfs and
          platform data of MAX8998/LP3974 PMICs.
 
+config CHARGER_BQ2415X
+       tristate "TI BQ2415x battery charger driver"
+       depends on I2C
+       help
+         Say Y to enable support for the TI BQ2415x battery charger
+         PMICs.
+
+         You'll need this driver to charge batteries on e.g. Nokia
+         RX-51/N900.
+
 config CHARGER_SMB347
        tristate "Summit Microelectronics SMB347 Battery Charger"
        depends on I2C
@@ -329,13 +346,6 @@ config AB8500_BM
        help
          Say Y to include support for AB8500 battery management.
 
-config AB8500_BATTERY_THERM_ON_BATCTRL
-       bool "Thermistor connected on BATCTRL ADC"
-       depends on AB8500_BM
-       help
-         Say Y to enable battery temperature measurements using
-         thermistor connected on BATCTRL ADC.
-
 source "drivers/power/reset/Kconfig"
 
 endif # POWER_SUPPLY