diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 17:12:22 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 17:12:22 +0100 |
commit | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (patch) | |
tree | 7a0ebba8b14d889a8b42edfa1272be222b908a82 /arch/arm/Makefile | |
parent | 7e1efcf5d2039fb7a91e21df32f4175dbca4d61c (diff) | |
parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) | |
download | blackbird-op-linux-c72dbae971400e466ad9ff16c920cd6d9d8c55a1.tar.gz blackbird-op-linux-c72dbae971400e466ad9ff16c920cd6d9d8c55a1.zip |
Merge branch 'imx/devel' into next/dt
The board changes in the imx/devel branch conflict with other changes in
the device imx/dt branch.
Conflicts:
arch/arm/mach-mx5/board-mx53_loco.c
arch/arm/mach-mx5/board-mx53_smd.c
arch/arm/plat-mxc/include/mach/common.h
arch/arm/plat-mxc/include/mach/memory.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5665c2a3b652..8904caa736cb 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -157,9 +157,7 @@ machine-$(CONFIG_ARCH_LPC32XX) := lpc32xx machine-$(CONFIG_ARCH_MMP) := mmp machine-$(CONFIG_ARCH_MSM) := msm machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 -machine-$(CONFIG_ARCH_MX1) := imx -machine-$(CONFIG_ARCH_MX2) := imx -machine-$(CONFIG_ARCH_MX25) := imx +machine-$(CONFIG_ARCH_IMX_V4_V5) := imx machine-$(CONFIG_ARCH_MX3) := imx machine-$(CONFIG_ARCH_MX5) := mx5 machine-$(CONFIG_ARCH_MXS) := mxs |