diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:44:48 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:44:48 +0400 |
| commit | 6f6184a9d01880a3e21349544f73b3720ce5e152 (patch) | |
| tree | 3ef9653cccffb17114cff6a7adc0b9fbe4793402 /arch/arm/mach-mxs/Makefile | |
| parent | 2cd050062f1ad5834d07f9b392b7d04848f79667 (diff) | |
| parent | 05d900c9d8ce536c6792efb323c82b1c97b54bf9 (diff) | |
| download | linux-6f6184a9d01880a3e21349544f73b3720ce5e152.tar.xz | |
Merge branch 'imx/cleanup' into next/cleanup
Diffstat (limited to 'arch/arm/mach-mxs/Makefile')
| -rw-r--r-- | arch/arm/mach-mxs/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile index 6c38262a3aaa..ea8dcb7742bc 100644 --- a/arch/arm/mach-mxs/Makefile +++ b/arch/arm/mach-mxs/Makefile @@ -1,11 +1,11 @@ # Common support -obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o +obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o mm.o obj-$(CONFIG_MXS_OCOTP) += ocotp.o obj-$(CONFIG_PM) += pm.o -obj-$(CONFIG_SOC_IMX23) += clock-mx23.o mm-mx23.o -obj-$(CONFIG_SOC_IMX28) += clock-mx28.o mm-mx28.o +obj-$(CONFIG_SOC_IMX23) += clock-mx23.o +obj-$(CONFIG_SOC_IMX28) += clock-mx28.o obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o |