diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 15:20:38 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:20:38 -0800 |
| commit | d052e161c4067cf21daacb1de960a1e449babfe4 (patch) | |
| tree | 7a2c24d269b5b631439d4d02345feeec98977ece /arch/arm/mach-mxs/Makefile | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 79ce72aa2cf205cc1c1f7d9e898141c4d67da4af (diff) | |
Merge branch 'mxs/boards' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/boards
* 'mxs/boards' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: Add initial support for Bluegiga APX4 Development Kit
ARM: mxs: read correct values when setting up MAC
ARM: mx28evk: Simplify GPIO requests
ARM: mx28: Remove duplicate OCOTP error message
ARM: mxs: detect SoC by checking CHIPID register
Diffstat (limited to 'arch/arm/mach-mxs/Makefile')
| -rw-r--r-- | arch/arm/mach-mxs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile index 8c93b24896b..908bf9a567f 100644 --- a/arch/arm/mach-mxs/Makefile +++ b/arch/arm/mach-mxs/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_MACH_STMP378X_DEVB) += mach-stmp378x_devb.o obj-$(CONFIG_MACH_MX23EVK) += mach-mx23evk.o obj-$(CONFIG_MACH_MX28EVK) += mach-mx28evk.o obj-$(CONFIG_MACH_M28EVK) += mach-m28evk.o +obj-$(CONFIG_MACH_APX4DEVKIT) += mach-apx4devkit.o obj-$(CONFIG_MODULE_TX28) += module-tx28.o obj-$(CONFIG_MACH_TX28) += mach-tx28.o |