diff options
author | Tony Lindgren <tony@atomide.com> | 2009-09-03 10:17:39 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-09-03 10:17:39 -0700 |
commit | 1f685b36dbf27db55072fb738aac57aaf37d2c71 (patch) | |
tree | 43cdcd1288d3bfa042a7cd6a89d2bf40f9b0261e /arch/arm/mach-omap2/Makefile | |
parent | 5567fa1f543dde3c42f8e52bf4f7005135b24896 (diff) | |
parent | ca4caa4e1d45f9542fa54263974d0ef637157b4a (diff) |
Merge branch '2_6_32_for_next' of git://git.pwsan.com/linux-2.6 into for-next
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 8850a247bec..8cb16777661 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -5,7 +5,7 @@ # Common support obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o -omap-2-3-common = irq.o sdrc.o +omap-2-3-common = irq.o sdrc.o omap_hwmod.o prcm-common = prcm.o powerdomain.o clock-common = clock.o clockdomain.o @@ -35,6 +35,11 @@ obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o obj-$(CONFIG_PM_DEBUG) += pm-debug.o endif +# PRCM +obj-$(CONFIG_ARCH_OMAP2) += cm.o +obj-$(CONFIG_ARCH_OMAP3) += cm.o +obj-$(CONFIG_ARCH_OMAP4) += cm4xxx.o + # Clock framework obj-$(CONFIG_ARCH_OMAP2) += clock24xx.o obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o |