diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-06 19:53:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-06 19:53:48 +0200 |
| commit | 1b984fbe0f21711975f80667f7e8b240e7848fd7 (patch) | |
| tree | 82309aada7533c925a10c2f9a522a807c761e9a6 /arch/arm/mach-mxs/Makefile | |
| parent | b29ee91c622ca50429012b9e2e3c87e434604c0f (diff) | |
| parent | 6eec0152c4aa43636e180b21d5c71743f25d1220 (diff) | |
| download | linux-next-1b984fbe0f21711975f80667f7e8b240e7848fd7.tar.gz | |
Merge branch 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
* 'mxs/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: always build ocotp
ARM: mxs: Remove MMAP_MIN_ADDR setting from mxs_defconfig
ARM: mx28: Fix registers range
ARM: mx23: Fix registers range
Diffstat (limited to 'arch/arm/mach-mxs/Makefile')
| -rw-r--r-- | arch/arm/mach-mxs/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile index e41590ccb437..fed3695a1339 100644 --- a/arch/arm/mach-mxs/Makefile +++ b/arch/arm/mach-mxs/Makefile @@ -1,7 +1,6 @@ # Common support -obj-y := devices.o icoll.o iomux.o system.o timer.o mm.o +obj-y := devices.o icoll.o iomux.o ocotp.o system.o timer.o mm.o -obj-$(CONFIG_MXS_OCOTP) += ocotp.o obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_MACH_MXS_DT) += mach-mxs.o |