diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 10:48:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 10:48:37 -0400 |
| commit | d50f58bbd979e86378dfdec982452041f0e604ef (patch) | |
| tree | 511938033b3346983175c70dd4d0afeb00b59b82 /arch/arm/Makefile | |
| parent | 129961ecaf21c9ee899ad9067d917c1aa172fb7a (diff) | |
| parent | 79d3c2c2395a89a70d25f0c77c11afc87efab89b (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 71cbb17ff89c..21ceada460dd 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -150,8 +150,8 @@ machine-$(CONFIG_ARCH_LPC32XX) := lpc32xx | |||
| 150 | machine-$(CONFIG_ARCH_MMP) := mmp | 150 | machine-$(CONFIG_ARCH_MMP) := mmp |
| 151 | machine-$(CONFIG_ARCH_MSM) := msm | 151 | machine-$(CONFIG_ARCH_MSM) := msm |
| 152 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | 152 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |
| 153 | machine-$(CONFIG_ARCH_MX1) := mx1 | 153 | machine-$(CONFIG_ARCH_MX1) := imx |
| 154 | machine-$(CONFIG_ARCH_MX2) := mx2 | 154 | machine-$(CONFIG_ARCH_MX2) := imx |
| 155 | machine-$(CONFIG_ARCH_MX25) := mx25 | 155 | machine-$(CONFIG_ARCH_MX25) := mx25 |
| 156 | machine-$(CONFIG_ARCH_MX3) := mx3 | 156 | machine-$(CONFIG_ARCH_MX3) := mx3 |
| 157 | machine-$(CONFIG_ARCH_MX5) := mx5 | 157 | machine-$(CONFIG_ARCH_MX5) := mx5 |