diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 20:32:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-25 20:32:49 -0700 |
| commit | 72de4c63e5ebe8e4054ea800d7a8d4b3f033caf2 (patch) | |
| tree | 64f1700cce49b20155e6bf76dbd79f611d0a06fc /drivers/power/pm2301_charger.c | |
| 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/pm2301_charger.c')
| -rw-r--r-- | drivers/power/pm2301_charger.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c index a44175139bb..fef56e2041b 100644 --- a/drivers/power/pm2301_charger.c +++ b/drivers/power/pm2301_charger.c @@ -1269,5 +1269,5 @@ module_exit(pm2xxx_charger_exit); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Rajkumar kasirajan, Olivier Launay"); -MODULE_ALIAS("platform:pm2xxx-charger"); +MODULE_ALIAS("i2c:pm2xxx-charger"); MODULE_DESCRIPTION("PM2xxx charger management driver"); |