diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/Makefile | |
| parent | ec19628d72cff8f80220b7cedba089074ac6a599 (diff) | |
| parent | dc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 458a01516676..25750bcb3397 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -158,9 +158,8 @@ machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | |||
| 158 | machine-$(CONFIG_ARCH_MX1) := imx | 158 | machine-$(CONFIG_ARCH_MX1) := imx |
| 159 | machine-$(CONFIG_ARCH_MX2) := imx | 159 | machine-$(CONFIG_ARCH_MX2) := imx |
| 160 | machine-$(CONFIG_ARCH_MX25) := imx | 160 | machine-$(CONFIG_ARCH_MX25) := imx |
| 161 | machine-$(CONFIG_ARCH_MX3) := mx3 | 161 | machine-$(CONFIG_ARCH_MX3) := imx |
| 162 | machine-$(CONFIG_ARCH_MX5) := mx5 | 162 | machine-$(CONFIG_ARCH_MX5) := mx5 |
| 163 | machine-$(CONFIG_ARCH_MXC91231) := mxc91231 | ||
| 164 | machine-$(CONFIG_ARCH_MXS) := mxs | 163 | machine-$(CONFIG_ARCH_MXS) := mxs |
| 165 | machine-$(CONFIG_ARCH_NETX) := netx | 164 | machine-$(CONFIG_ARCH_NETX) := netx |
| 166 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik | 165 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik |