summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-07-03 16:13:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-03 16:13:28 +0100
commit946e2ad040000a14b7316fae722e7e65fa09ffe5 (patch)
tree6bc244a1c49221335e14bf795403debf6f24712d /arch/arm/Makefile
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff)
parente055d5bff318845f99c0fbf93245767fab8dce88 (diff)
downloadop-kernel-dev-946e2ad040000a14b7316fae722e7e65fa09ffe5.zip
op-kernel-dev-946e2ad040000a14b7316fae722e7e65fa09ffe5.tar.gz
Merge branch 'fb' into devel
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index e72db27..1c84063 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)
OpenPOWER on IntegriCloud