diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-11-30 17:46:36 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-11-30 17:46:36 -0500 |
| commit | 52aa8c539dad56728527de664f368915ff44badf (patch) | |
| tree | 4aa8615023e0bc49153e1dc160fd727f09eb4f71 /arch/arm/mach-omap2/Makefile | |
| parent | 55a4e78952286d498d89a399d845e7cfaa8ddd56 (diff) | |
| parent | 032a6424aeea7333a8dafc8cc05dd10b09c62680 (diff) | |
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/Makefile | 1 |
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 | |||
| 42 | obj-$(CONFIG_ARCH_OMAP2420) += mux2420.o | 42 | obj-$(CONFIG_ARCH_OMAP2420) += mux2420.o |
| 43 | obj-$(CONFIG_ARCH_OMAP2430) += mux2430.o | 43 | obj-$(CONFIG_ARCH_OMAP2430) += mux2430.o |
| 44 | obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o | 44 | obj-$(CONFIG_ARCH_OMAP3) += mux34xx.o |
| 45 | obj-$(CONFIG_ARCH_OMAP4) += mux44xx.o | ||
| 45 | 46 | ||
| 46 | # SMS/SDRC | 47 | # SMS/SDRC |
| 47 | obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o | 48 | obj-$(CONFIG_ARCH_OMAP2) += sdrc2xxx.o |