diff options
| author | Tony Lindgren | 2010-09-23 20:05:25 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2010-09-23 20:05:25 +0200 |
| commit | 9af2ebbd09e01bd2711617dcafce5f608cace6ec (patch) | |
| tree | 637af612e07c98a0fd998e558a56382a52eeab36 /arch/arm/mach-omap2/Makefile | |
| parent | HTCHERALD: MMC, I2C, HTCPLD, SPI, TSC2046 (diff) | |
| parent | OMAP: hwmod: improve documentation, clean up function names (diff) | |
| download | kernel-qcow2-linux-9af2ebbd09e01bd2711617dcafce5f608cace6ec.tar.gz kernel-qcow2-linux-9af2ebbd09e01bd2711617dcafce5f608cace6ec.tar.xz kernel-qcow2-linux-9af2ebbd09e01bd2711617dcafce5f608cace6ec.zip | |
Merge branch 'hwmod_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 88d3a1e920f5..eb2504a300c2 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 pm.o -omap-2-3-common = irq.o sdrc.o +omap-2-3-common = irq.o sdrc.o prm2xxx_3xxx.o hwmod-common = omap_hwmod.o \ omap_hwmod_common_data.o prcm-common = prcm.o powerdomain.o @@ -15,7 +15,7 @@ clock-common = clock.o clock_common_data.o \ obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(hwmod-common) obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(hwmod-common) -obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) $(hwmod-common) +obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) prm44xx.o $(hwmod-common) obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o |