diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 23:32:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 23:32:49 -0400 |
commit | 72de4c63e5ebe8e4054ea800d7a8d4b3f033caf2 (patch) | |
tree | 64f1700cce49b20155e6bf76dbd79f611d0a06fc /drivers/power/Kconfig | |
parent | 1aad08dc571604ebe473e2a187f0f7b211ae6c3f (diff) | |
parent | dccab6092d3c25bf943d12fb658e63fd88bf8b4a (diff) |
Merge tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6
Pull bettery fixes from Anton Vorontsov:
"Last minute one-liners: wrong kfree usage fix, module alias fixup and
kconfig adjustments"
* tag 'for-v3.10-fixes' of git://git.infradead.org/battery-2.6:
pm2301_charger: Fix module alias prefix
wm831x_backup: Fix wrong kfree call for devdata->backup.name
bq27x00: Fix I2C dependency in KConfig
lp8788-charger: Fix kconfig dependency
Diffstat (limited to 'drivers/power/Kconfig')
-rw-r--r-- | drivers/power/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 0d0b5d7d19d0..7b8979c63f48 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
@@ -152,6 +152,7 @@ config BATTERY_SBS | |||
152 | 152 | ||
153 | config BATTERY_BQ27x00 | 153 | config BATTERY_BQ27x00 |
154 | tristate "BQ27x00 battery driver" | 154 | tristate "BQ27x00 battery driver" |
155 | depends on I2C || I2C=n | ||
155 | help | 156 | help |
156 | Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips. | 157 | Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips. |
157 | 158 | ||
@@ -284,6 +285,7 @@ config CHARGER_LP8788 | |||
284 | tristate "TI LP8788 charger driver" | 285 | tristate "TI LP8788 charger driver" |
285 | depends on MFD_LP8788 | 286 | depends on MFD_LP8788 |
286 | depends on LP8788_ADC | 287 | depends on LP8788_ADC |
288 | depends on IIO | ||
287 | help | 289 | help |
288 | Say Y to enable support for the LP8788 linear charger. | 290 | Say Y to enable support for the LP8788 linear charger. |
289 | 291 | ||