diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-03 11:13:28 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-03 11:13:28 -0400 |
| commit | 946e2ad040000a14b7316fae722e7e65fa09ffe5 (patch) | |
| tree | 6bc244a1c49221335e14bf795403debf6f24712d /arch/arm/Makefile | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
| parent | e055d5bff318845f99c0fbf93245767fab8dce88 (diff) | |
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 | |||
| 100 | incdir-$(CONFIG_ARCH_CLPS7500) := cl7500 | 100 | incdir-$(CONFIG_ARCH_CLPS7500) := cl7500 |
| 101 | machine-$(CONFIG_FOOTBRIDGE) := footbridge | 101 | machine-$(CONFIG_FOOTBRIDGE) := footbridge |
| 102 | incdir-$(CONFIG_FOOTBRIDGE) := ebsa285 | 102 | incdir-$(CONFIG_FOOTBRIDGE) := ebsa285 |
| 103 | machine-$(CONFIG_ARCH_CO285) := footbridge | ||
| 104 | incdir-$(CONFIG_ARCH_CO285) := ebsa285 | ||
| 105 | machine-$(CONFIG_ARCH_SHARK) := shark | 103 | machine-$(CONFIG_ARCH_SHARK) := shark |
| 106 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 104 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
| 107 | ifeq ($(CONFIG_ARCH_SA1100),y) | 105 | ifeq ($(CONFIG_ARCH_SA1100),y) |