diff options
author | Tony Lindgren | 2010-09-24 02:29:28 +0200 |
---|---|---|
committer | Tony Lindgren | 2010-09-24 02:29:28 +0200 |
commit | 172c11351576cf5daa8f1b02a265bf84de8bbed1 (patch) | |
tree | 5bd75dc35bfced691abdef92bde861ca246b4321 /arch/arm/mach-omap2/Makefile | |
parent | Merge branch 'hwmod_2.6.37' of git://git.pwsan.com/linux-2.6 into omap-for-linus (diff) | |
parent | OMAP: GPIO: ensure debounce clocks are disabled during idle/suspend (diff) | |
download | kernel-qcow2-linux-172c11351576cf5daa8f1b02a265bf84de8bbed1.tar.gz kernel-qcow2-linux-172c11351576cf5daa8f1b02a265bf84de8bbed1.tar.xz kernel-qcow2-linux-172c11351576cf5daa8f1b02a265bf84de8bbed1.zip |
Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r-- | arch/arm/mach-omap2/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index eb2504a300c2..826cb0980054 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -87,6 +87,7 @@ obj-$(CONFIG_ARCH_OMAP2430) += opp2430_data.o obj-$(CONFIG_ARCH_OMAP2420) += omap_hwmod_2420_data.o obj-$(CONFIG_ARCH_OMAP2430) += omap_hwmod_2430_data.o obj-$(CONFIG_ARCH_OMAP3) += omap_hwmod_3xxx_data.o +obj-$(CONFIG_ARCH_OMAP4) += omap_hwmod_44xx_data.o # EMU peripherals obj-$(CONFIG_OMAP3_EMU) += emu.o |