diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-03 16:13:28 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-03 16:13:28 +0100 |
| commit | 946e2ad040000a14b7316fae722e7e65fa09ffe5 (patch) | |
| tree | 6bc244a1c49221335e14bf795403debf6f24712d /arch/arm/Kconfig | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
| parent | e055d5bff318845f99c0fbf93245767fab8dce88 (diff) | |
| download | op-kernel-dev-946e2ad040000a14b7316fae722e7e65fa09ffe5.zip op-kernel-dev-946e2ad040000a14b7316fae722e7e65fa09ffe5.tar.gz | |
Merge branch 'fb' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b786e68..9773a3f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -232,13 +232,6 @@ config ARCH_CLPS711X help Support for Cirrus Logic 711x/721x based boards. -config ARCH_CO285 - bool "Co-EBSA285" - select FOOTBRIDGE - select FOOTBRIDGE_ADDIN - help - Support for Intel's EBSA285 companion chip. - config ARCH_EBSA110 bool "EBSA-110" select ISA @@ -789,7 +782,7 @@ source "mm/Kconfig" config LEDS bool "Timer and CPU usage LEDs" - depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \ + depends on ARCH_CDB89712 || ARCH_EBSA110 || \ ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ |
