Merge remote-tracking branch 'ext3/for_next'

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

diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 237d7aa73e8c8e15d74560c97560fb0ebdfcfead..1ddd13cc0c07ec9ac5b36715133ed6b7b1669450 100644 (file)
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -160,22 +160,16 @@ config BATTERY_SBS
 config BATTERY_BQ27XXX
        tristate "BQ27xxx battery driver"
        help
-         Say Y here to enable support for batteries with BQ27xxx (I2C/HDQ) chips.
+         Say Y here to enable support for batteries with BQ27xxx chips.
 
 config BATTERY_BQ27XXX_I2C
-       bool "BQ27xxx I2C support"
+       tristate "BQ27xxx I2C support"
        depends on BATTERY_BQ27XXX
        depends on I2C
        default y
        help
-         Say Y here to enable support for batteries with BQ27xxx (I2C) chips.
-
-config BATTERY_BQ27XXX_PLATFORM
-       bool "BQ27xxx HDQ support"
-       depends on BATTERY_BQ27XXX
-       default y
-       help
-         Say Y here to enable support for batteries with BQ27xxx (HDQ) chips.
+         Say Y here to enable support for batteries with BQ27xxx chips
+         connected over an I2C bus.
 
 config BATTERY_DA9030
        tristate "DA9030 battery driver"
@@ -508,8 +502,7 @@ config AXP20X_POWER
          This driver provides support for the power supply features of
          AXP20x PMIC.
 
-source "drivers/power/reset/Kconfig"
-
 endif # POWER_SUPPLY
 
+source "drivers/power/reset/Kconfig"
 source "drivers/power/avs/Kconfig"