diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-26 05:32:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-26 05:32:49 +0200 |
| commit | 72de4c63e5ebe8e4054ea800d7a8d4b3f033caf2 (patch) | |
| tree | 64f1700cce49b20155e6bf76dbd79f611d0a06fc /drivers/power/Kconfig | |
| parent | Merge tag 'pm+acpi-3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | pm2301_charger: Fix module alias prefix (diff) | |
| download | linux-72de4c63e5ebe8e4054ea800d7a8d4b3f033caf2.tar.xz linux-72de4c63e5ebe8e4054ea800d7a8d4b3f033caf2.zip | |
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 config BATTERY_BQ27x00 tristate "BQ27x00 battery driver" + depends on I2C || I2C=n help Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips. @@ -284,6 +285,7 @@ config CHARGER_LP8788 tristate "TI LP8788 charger driver" depends on MFD_LP8788 depends on LP8788_ADC + depends on IIO help Say Y to enable support for the LP8788 linear charger. |