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/Kconfig | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
| parent | e055d5bff318845f99c0fbf93245767fab8dce88 (diff) | |
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 b786e68914d4..9773a3f730f3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -232,13 +232,6 @@ config ARCH_CLPS711X | |||
| 232 | help | 232 | help |
| 233 | Support for Cirrus Logic 711x/721x based boards. | 233 | Support for Cirrus Logic 711x/721x based boards. |
| 234 | 234 | ||
| 235 | config ARCH_CO285 | ||
| 236 | bool "Co-EBSA285" | ||
| 237 | select FOOTBRIDGE | ||
| 238 | select FOOTBRIDGE_ADDIN | ||
| 239 | help | ||
| 240 | Support for Intel's EBSA285 companion chip. | ||
| 241 | |||
| 242 | config ARCH_EBSA110 | 235 | config ARCH_EBSA110 |
| 243 | bool "EBSA-110" | 236 | bool "EBSA-110" |
| 244 | select ISA | 237 | select ISA |
| @@ -789,7 +782,7 @@ source "mm/Kconfig" | |||
| 789 | 782 | ||
| 790 | config LEDS | 783 | config LEDS |
| 791 | bool "Timer and CPU usage LEDs" | 784 | bool "Timer and CPU usage LEDs" |
| 792 | depends on ARCH_CDB89712 || ARCH_CO285 || ARCH_EBSA110 || \ | 785 | depends on ARCH_CDB89712 || ARCH_EBSA110 || \ |
| 793 | ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ | 786 | ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ |
| 794 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ | 787 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ |
| 795 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ | 788 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ |