aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/Makefile
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-11-30 14:46:36 -0800
committerTony Lindgren <tony@atomide.com>2010-11-30 14:46:36 -0800
commit52aa8c539dad56728527de664f368915ff44badf (patch)
tree4aa8615023e0bc49153e1dc160fd727f09eb4f71 /arch/arm/mach-omap2/Makefile
parentMerge branch 'pm-hwmod-i2c' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus (diff)
parentOMAP: mux: Add __func__ macro to pr_xxx macros (diff)
downloadlinux-dev-52aa8c539dad56728527de664f368915ff44badf.tar.xz
linux-dev-52aa8c539dad56728527de664f368915ff44badf.zip
Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
-rw-r--r--arch/arm/mach-omap2/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index d43bd33a19be..ce7b1f017670 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -42,6 +42,7 @@ AFLAGS_sram34xx.o :=-Wa,-march=armv7-a
obj-$(CONFIG_ARCH_OMAP2420) += mux2420.o
obj-$(CONFIG_ARCH_OMAP2430) += mux2430.o
obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o
+obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o
# SMS/SDRC
obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o