diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 15:57:31 -0400 |
| commit | a2ab67fae1ab9226679495a8d260f4e6555efc5f (patch) | |
| tree | f7de683c9c8ff0869a7e11f1d40802145d05f5b4 /arch/arm/Makefile | |
| parent | 6d0485a99366d4e0e7e725f14995c74cb7ca4499 (diff) | |
| parent | 135cad366b4e7d6a79f6369f6cb5b721985aa62f (diff) | |
Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 885a83724b9c..b6b9f6ee467b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -115,7 +115,6 @@ machine-$(CONFIG_ARCH_EBSA110) := ebsa110 | |||
| 115 | machine-$(CONFIG_ARCH_EP93XX) := ep93xx | 115 | machine-$(CONFIG_ARCH_EP93XX) := ep93xx |
| 116 | machine-$(CONFIG_ARCH_GEMINI) := gemini | 116 | machine-$(CONFIG_ARCH_GEMINI) := gemini |
| 117 | machine-$(CONFIG_ARCH_H720X) := h720x | 117 | machine-$(CONFIG_ARCH_H720X) := h720x |
| 118 | machine-$(CONFIG_ARCH_IMX) := imx | ||
| 119 | machine-$(CONFIG_ARCH_INTEGRATOR) := integrator | 118 | machine-$(CONFIG_ARCH_INTEGRATOR) := integrator |
| 120 | machine-$(CONFIG_ARCH_IOP13XX) := iop13xx | 119 | machine-$(CONFIG_ARCH_IOP13XX) := iop13xx |
| 121 | machine-$(CONFIG_ARCH_IOP32X) := iop32x | 120 | machine-$(CONFIG_ARCH_IOP32X) := iop32x |