diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 21:51:22 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 21:51:38 +0200 |
commit | df69a4627eb5de58ec71fdf6a7b5d0ce9410d57e (patch) | |
tree | 8f7587ab9a24a3c04afe842c3a7d51cb2c31a1cc /arch/arm/Kconfig | |
parent | e3a66aa33a8f06924f67770e15c22a5c52df314e (diff) | |
parent | 25e4b485fb8eeda8aa7a2e1e45fbb31538565117 (diff) | |
download | linux-df69a4627eb5de58ec71fdf6a7b5d0ce9410d57e.tar.bz2 |
Merge branch 'bcmring/removal' into next/multiplatform
The removal of bcmring has non-obvious commits with the way the
multiplatform configuration works, so merge it in here.
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-bcmring/arch.c
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 f416422ddb0e..f7673b4e56bc 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -345,18 +345,6 @@ config ARCH_BCM2835 This enables support for the Broadcom BCM2835 SoC. This SoC is use in the Raspberry Pi, and Roku 2 devices. -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_CLPS711X bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" select CPU_ARM720T @@ -1020,8 +1008,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" |