diff options
| author | Russell King | 2008-07-03 17:13:28 +0200 |
|---|---|---|
| committer | Russell King | 2008-07-03 17:13:28 +0200 |
| commit | 946e2ad040000a14b7316fae722e7e65fa09ffe5 (patch) | |
| tree | 6bc244a1c49221335e14bf795403debf6f24712d /arch/arm/Makefile | |
| parent | Linux 2.6.26-rc8 (diff) | |
| parent | [ARM] 5015/1: arm: remove ARCH_CO285 (diff) | |
| download | kernel-qcow2-linux-946e2ad040000a14b7316fae722e7e65fa09ffe5.tar.gz kernel-qcow2-linux-946e2ad040000a14b7316fae722e7e65fa09ffe5.tar.xz kernel-qcow2-linux-946e2ad040000a14b7316fae722e7e65fa09ffe5.zip | |
Merge branch 'fb' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e72db27e0ba0..1c840639f828 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -100,8 +100,6 @@ textofs-y := 0x00008000 incdir-$(CONFIG_ARCH_CLPS7500) := cl7500 machine-$(CONFIG_FOOTBRIDGE) := footbridge incdir-$(CONFIG_FOOTBRIDGE) := ebsa285 - machine-$(CONFIG_ARCH_CO285) := footbridge - incdir-$(CONFIG_ARCH_CO285) := ebsa285 machine-$(CONFIG_ARCH_SHARK) := shark machine-$(CONFIG_ARCH_SA1100) := sa1100 ifeq ($(CONFIG_ARCH_SA1100),y) |