diff options
author | Tony Lindgren <tony@atomide.com> | 2012-06-26 13:55:23 (GMT) |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-06-26 13:55:23 (GMT) |
commit | 9e74f218abd04dfa082391672295ecc1a3654845 (patch) | |
tree | d668104b1021bcc737b5fadc7992f45a4c638705 /drivers/power/Makefile | |
parent | b955eefc46a6923424cbede2f8ab76c8f5acf056 (diff) | |
parent | 21ff63ad131218048525fbd37d065ce61f03bcbd (diff) | |
download | linux-fsl-qoriq-9e74f218abd04dfa082391672295ecc1a3654845.tar.xz |
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-driver
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 b6b2434..ee58afb 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -43,4 +43,5 @@ obj-$(CONFIG_CHARGER_GPIO) += gpio-charger.o obj-$(CONFIG_CHARGER_MANAGER) += charger-manager.o obj-$(CONFIG_CHARGER_MAX8997) += max8997_charger.o obj-$(CONFIG_CHARGER_MAX8998) += max8998_charger.o +obj-$(CONFIG_POWER_AVS) += avs/ obj-$(CONFIG_CHARGER_SMB347) += smb347-charger.o |