diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 23:43:35 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 23:43:35 +0400 |
| commit | 0b40b4b44378f18b3c76384fa1380c24b5cd0f52 (patch) | |
| tree | 35aada569a65dba9c28423401fdb428bc1c7ec9a /arch/arm/Kconfig | |
| parent | 4369c5f3ae82009aa45115884208aada5a8c9273 (diff) | |
| parent | 25e4b485fb8eeda8aa7a2e1e45fbb31538565117 (diff) | |
| download | linux-0b40b4b44378f18b3c76384fa1380c24b5cd0f52.tar.xz | |
Merge branch 'bcmring/removal' into next/cleanup2
From "Christian Daudt" <csd@broadcom.com>:
Remove mach-bcmring as this is no longer maintained or used.
Updated the removal with:
- drop the edit to mach-types requested by Russell King
- eliminate defconfig mod from patch 1 requested Olof Johansson
Also switched to using git send-email to avoid word-wrapping
problems
* bcmring/removal:
ARM: Remove mach-bcmring
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c2f0b92c12a2..6de2c4fd7fa2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -350,18 +350,6 @@ config ARCH_AT91 This enables support for systems based on Atmel AT91RM9200 and AT91SAM9* processors. -config ARCH_BCMRING - bool "Broadcom BCMRING" - depends on MMU - select CPU_V6 - select ARM_AMBA - select ARM_TIMER_SP804 - select CLKDEV_LOOKUP - select GENERIC_CLOCKEVENTS - select ARCH_WANT_OPTIONAL_GPIOLIB - help - Support for Broadcom's BCMRing platform. - config ARCH_HIGHBANK bool "Calxeda Highbank-based" select ARCH_WANT_OPTIONAL_GPIOLIB @@ -1034,8 +1022,6 @@ source "arch/arm/mach-mvebu/Kconfig" source "arch/arm/mach-at91/Kconfig" -source "arch/arm/mach-bcmring/Kconfig" - source "arch/arm/mach-clps711x/Kconfig" source "arch/arm/mach-cns3xxx/Kconfig" |