diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:37 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-29 15:48:37 +0100 |
| commit | d50f58bbd979e86378dfdec982452041f0e604ef (patch) | |
| tree | 511938033b3346983175c70dd4d0afeb00b59b82 /arch/arm/Makefile | |
| parent | Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable (diff) | |
| parent | mx2_camera: fix type of dma buffer virtual address pointer (diff) | |
| download | linux-dev-d50f58bbd979e86378dfdec982452041f0e604ef.tar.xz linux-dev-d50f58bbd979e86378dfdec982452041f0e604ef.zip | |
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 machine-$(CONFIG_ARCH_MMP) := mmp machine-$(CONFIG_ARCH_MSM) := msm machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 -machine-$(CONFIG_ARCH_MX1) := mx1 -machine-$(CONFIG_ARCH_MX2) := mx2 +machine-$(CONFIG_ARCH_MX1) := imx +machine-$(CONFIG_ARCH_MX2) := imx machine-$(CONFIG_ARCH_MX25) := mx25 machine-$(CONFIG_ARCH_MX3) := mx3 machine-$(CONFIG_ARCH_MX5) := mx5 |