diff options
author | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:14:33 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-09-15 16:14:33 -0700 |
commit | 23618f7faa8fdac93d4823d0372f4101d642b8b1 (patch) | |
tree | 9cdc7fb633ec7c0f24eee93a968bb799f45608e2 /arch/arm/mach-omap2/Makefile | |
parent | ceb1c532ba6220900e61ec7073a9234661efa450 (diff) | |
parent | ee7fbba63e334481049a7939b8071160824447d3 (diff) |
Merge branch 'for_3.2/voltage-cleanup' of git://gitorious.org/khilman/linux-omap-pm into voltage
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index cd45c045ab8..8bd389d6013 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -90,8 +90,9 @@ obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cminst44xx.o \ # OMAP voltage domains ifeq ($(CONFIG_PM),y) -voltagedomain-common := voltage.o -obj-$(CONFIG_ARCH_OMAP2) += $(voltagedomain-common) +voltagedomain-common := voltage.o vc.o vp.o +obj-$(CONFIG_ARCH_OMAP2) += $(voltagedomain-common) \ + voltagedomains2xxx_data.o obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common) \ voltagedomains3xxx_data.o obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) \ |