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>

1 files changed, 0 insertions, 19 deletions

diff --git a/arch/arm/mach-bcmring/Kconfig b/arch/arm/mach-bcmring/Kconfig
deleted file mode 100644
index 9170d16dca50..000000000000
--- a/arch/arm/mach-bcmring/Kconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-choice
-        prompt "Processor selection in BCMRING family of devices"
-        depends on ARCH_BCMRING
-        default ARCH_BCM11107
-
-config ARCH_FPGA11107
-        bool "FPGA11107"
-
-config ARCH_BCM11107
-        bool "BCM11107"
-endchoice
-
-menu "BCMRING Options"
-        depends on ARCH_BCMRING
-
-config BCM_ZRELADDR
-        hex "Compressed ZREL ADDR"
-
-endmenu