diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-16 11:08:33 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-16 11:08:33 +0100 |
| commit | e910b63d009701ad4ebbeb089aba35707fa5d68e (patch) | |
| tree | f7fdd3c2b1d9165d69a778c434e664f8789f4401 /arch/arm/Makefile | |
| parent | 2f7989efd4398d92b8adffce2e07dd043a0895fe (diff) | |
| parent | c9c6fe5033191d82e1d819105485c795062107fd (diff) | |
Merge branch 'l7200' into devel
Conflicts:
arch/arm/configs/lusl7200_defconfig
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 64ba313724d..bea37a2512e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -139,7 +139,6 @@ machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood machine-$(CONFIG_ARCH_KS8695) := ks8695 -machine-$(CONFIG_ARCH_L7200) := l7200 machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x machine-$(CONFIG_ARCH_LOKI) := loki machine-$(CONFIG_ARCH_MMP) := mmp |