diff options
| author | Anton Vorontsov <anton@enomsg.org> | 2013-02-03 04:25:57 +0100 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-02-03 04:29:13 +0100 |
| commit | 58a1c154d449aae97a8ecad67ddbfd4024ac8446 (patch) | |
| tree | 4d09553a369094149646e3018aa908b9e1294dba /drivers/power/Makefile | |
| parent | ab8500_btemp: Demote initcall sequence (diff) | |
| parent | u8500-charger: Delay for USB enumeration (diff) | |
| download | linux-58a1c154d449aae97a8ecad67ddbfd4024ac8446.tar.xz linux-58a1c154d449aae97a8ecad67ddbfd4024ac8446.zip | |
Merge branch 'tb-power-2' of git://git.linaro.org/people/ljones/linux-3.0-ux500
Pull a huge ab8500/pm2301 pile of changes from Lee Jones. Lee did an
awesome job cleaning this stuff up and thus brought ab8500 Stericsson's
development tree much closer to the mainline. Even more changes to come,
though.
Conflicts:
drivers/power/Kconfig
Diffstat (limited to 'drivers/power/Makefile')
| -rw-r--r-- | drivers/power/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index a9f5c06ad41a..3f66436af45c 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -47,6 +47,7 @@ obj-$(CONFIG_CHARGER_LP8727) += lp8727_charger.o obj-$(CONFIG_CHARGER_LP8788) += lp8788-charger.o obj-$(CONFIG_CHARGER_GPIO) += gpio-charger.o obj-$(CONFIG_CHARGER_MANAGER) += charger-manager.o +obj-$(CONFIG_CHARGER_PM2301) += pm2301_charger.o obj-$(CONFIG_CHARGER_MAX8997) += max8997_charger.o obj-$(CONFIG_CHARGER_MAX8998) += max8998_charger.o obj-$(CONFIG_CHARGER_BQ2415X) += bq2415x_charger.o |