diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:55 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:55 -0400 |
| commit | abc3f126ac736280c68db6472eb0040ddf6e1b1f (patch) | |
| tree | 4e3333cde6da6c49dcd81920410bf5a33055f03a /arch/arm/Makefile | |
| parent | b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea (diff) | |
| parent | 8bcb97659656042f3132b2814b19709856aa1335 (diff) | |
Merge branch 'imx/imx6q' into next/soc
Conflicts:
Documentation/devicetree/bindings/arm/fsl.txt
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/plat-mxc/include/mach/common.h
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e775f93844a..ae458aee8b6 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -159,7 +159,7 @@ machine-$(CONFIG_ARCH_MMP) := mmp | |||
| 159 | machine-$(CONFIG_ARCH_MSM) := msm | 159 | machine-$(CONFIG_ARCH_MSM) := msm |
| 160 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | 160 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |
| 161 | machine-$(CONFIG_ARCH_IMX_V4_V5) := imx | 161 | machine-$(CONFIG_ARCH_IMX_V4_V5) := imx |
| 162 | machine-$(CONFIG_ARCH_MX3) := imx | 162 | machine-$(CONFIG_ARCH_IMX_V6_V7) := imx |
| 163 | machine-$(CONFIG_ARCH_MX5) := mx5 | 163 | machine-$(CONFIG_ARCH_MX5) := mx5 |
| 164 | machine-$(CONFIG_ARCH_MXS) := mxs | 164 | machine-$(CONFIG_ARCH_MXS) := mxs |
| 165 | machine-$(CONFIG_ARCH_NETX) := netx | 165 | machine-$(CONFIG_ARCH_NETX) := netx |