diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:24:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:24:28 -0400 |
| commit | 7e0cac630c7c90f12a78131df9913657fa30243b (patch) | |
| tree | c09aa76b07a9bcb0ab0dea4885909421f7a9f4a6 /arch/arm/Makefile | |
| parent | 94314a40bcc537c396012e37cf887572f0d82aef (diff) | |
| parent | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 (diff) | |
Merge branch 'imx/devel' into imx/imx6q
Conflicts:
arch/arm/plat-mxc/include/mach/memory.h
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 | |||
| 157 | machine-$(CONFIG_ARCH_MMP) := mmp | 157 | machine-$(CONFIG_ARCH_MMP) := mmp |
| 158 | machine-$(CONFIG_ARCH_MSM) := msm | 158 | machine-$(CONFIG_ARCH_MSM) := msm |
| 159 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | 159 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |
| 160 | machine-$(CONFIG_ARCH_MX1) := imx | 160 | machine-$(CONFIG_ARCH_IMX_V4_V5) := imx |
| 161 | machine-$(CONFIG_ARCH_MX2) := imx | ||
| 162 | machine-$(CONFIG_ARCH_MX25) := imx | ||
| 163 | machine-$(CONFIG_ARCH_MX3) := imx | 161 | machine-$(CONFIG_ARCH_MX3) := imx |
| 164 | machine-$(CONFIG_ARCH_MX5) := mx5 | 162 | machine-$(CONFIG_ARCH_MX5) := mx5 |
| 165 | machine-$(CONFIG_ARCH_MXS) := mxs | 163 | machine-$(CONFIG_ARCH_MXS) := mxs |