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>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index f416422,ce61f4a..f7673b4
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -342,21 -372,8 +342,9 @@@ config ARCH_BCM283
        select SPARSE_IRQ
        select USE_OF
        help
 -        Support for the Calxeda Highbank SoC based boards.
 +        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

diff --cc arch/arm/Makefile
index 1c974cf,8383e2e..770da51
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -135,64 -135,68 +135,63 @@@ textofs-$(CONFIG_ARCH_MSM8960) := 0x002
  
  # Machine directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.
 -machine-$(CONFIG_ARCH_AT91)           := at91
 -machine-$(CONFIG_ARCH_CLPS711X)               := clps711x
 -machine-$(CONFIG_ARCH_CNS3XXX)                := cns3xxx
 -machine-$(CONFIG_ARCH_DAVINCI)                := davinci
 -machine-$(CONFIG_ARCH_DOVE)           := dove
 -machine-$(CONFIG_ARCH_EBSA110)                := ebsa110
 -machine-$(CONFIG_ARCH_EP93XX)         := ep93xx
 -machine-$(CONFIG_ARCH_GEMINI)         := gemini
 -machine-$(CONFIG_ARCH_H720X)          := h720x
 -machine-$(CONFIG_ARCH_HIGHBANK)               := highbank
 -machine-$(CONFIG_ARCH_INTEGRATOR)     := integrator
 -machine-$(CONFIG_ARCH_IOP13XX)                := iop13xx
 -machine-$(CONFIG_ARCH_IOP32X)         := iop32x
 -machine-$(CONFIG_ARCH_IOP33X)         := iop33x
 -machine-$(CONFIG_ARCH_IXP4XX)         := ixp4xx
 -machine-$(CONFIG_ARCH_KIRKWOOD)               := kirkwood
 -machine-$(CONFIG_ARCH_KS8695)         := ks8695
 -machine-$(CONFIG_ARCH_LPC32XX)                := lpc32xx
 -machine-$(CONFIG_ARCH_MMP)            := mmp
 -machine-$(CONFIG_ARCH_MSM)            := msm
 -machine-$(CONFIG_ARCH_MV78XX0)                := mv78xx0
 -machine-$(CONFIG_ARCH_IMX_V4_V5)      := imx
 -machine-$(CONFIG_ARCH_IMX_V6_V7)      := imx
 -machine-$(CONFIG_ARCH_MXS)            := mxs
 -machine-$(CONFIG_ARCH_MVEBU)          := mvebu
 -machine-$(CONFIG_ARCH_NETX)           := netx
 -machine-$(CONFIG_ARCH_NOMADIK)                := nomadik
 -machine-$(CONFIG_ARCH_OMAP1)          := omap1
 -machine-$(CONFIG_ARCH_OMAP2PLUS)      := omap2
 -machine-$(CONFIG_ARCH_ORION5X)                := orion5x
 -machine-$(CONFIG_ARCH_PICOXCELL)      := picoxcell
 -machine-$(CONFIG_ARCH_PNX4008)                := pnx4008
 -machine-$(CONFIG_ARCH_PRIMA2)         := prima2
 -machine-$(CONFIG_ARCH_PXA)            := pxa
 -machine-$(CONFIG_ARCH_REALVIEW)               := realview
 -machine-$(CONFIG_ARCH_RPC)            := rpc
 -machine-$(CONFIG_ARCH_S3C24XX)                := s3c24xx s3c2412 s3c2440
 -machine-$(CONFIG_ARCH_S3C64XX)                := s3c64xx
 -machine-$(CONFIG_ARCH_S5P64X0)                := s5p64x0
 -machine-$(CONFIG_ARCH_S5PC100)                := s5pc100
 -machine-$(CONFIG_ARCH_S5PV210)                := s5pv210
 -machine-$(CONFIG_ARCH_EXYNOS4)                := exynos
 -machine-$(CONFIG_ARCH_EXYNOS5)                := exynos
 -machine-$(CONFIG_ARCH_SA1100)         := sa1100
 -machine-$(CONFIG_ARCH_SHARK)          := shark
 -machine-$(CONFIG_ARCH_SHMOBILE)       := shmobile
 -machine-$(CONFIG_ARCH_TEGRA)          := tegra
 -machine-$(CONFIG_ARCH_U300)           := u300
 -machine-$(CONFIG_ARCH_U8500)          := ux500
 -machine-$(CONFIG_ARCH_VERSATILE)      := versatile
 -machine-$(CONFIG_ARCH_VEXPRESS)               := vexpress
 -machine-$(CONFIG_ARCH_VT8500)         := vt8500
 -machine-$(CONFIG_ARCH_W90X900)                := w90x900
 -machine-$(CONFIG_FOOTBRIDGE)          := footbridge
 -machine-$(CONFIG_ARCH_SOCFPGA)                := socfpga
 -machine-$(CONFIG_MACH_SPEAR1310)      := spear13xx
 -machine-$(CONFIG_MACH_SPEAR1340)      := spear13xx
 -machine-$(CONFIG_MACH_SPEAR300)               := spear3xx
 -machine-$(CONFIG_MACH_SPEAR310)               := spear3xx
 -machine-$(CONFIG_MACH_SPEAR320)               := spear3xx
 -machine-$(CONFIG_MACH_SPEAR600)               := spear6xx
 -machine-$(CONFIG_ARCH_ZYNQ)           := zynq
 +machine-$(CONFIG_ARCH_AT91)           += at91
 +machine-$(CONFIG_ARCH_BCM2835)                += bcm2835
- machine-$(CONFIG_ARCH_BCMRING)                += bcmring
 +machine-$(CONFIG_ARCH_CLPS711X)               += clps711x
 +machine-$(CONFIG_ARCH_CNS3XXX)                += cns3xxx
 +machine-$(CONFIG_ARCH_DAVINCI)                += davinci
 +machine-$(CONFIG_ARCH_DOVE)           += dove
 +machine-$(CONFIG_ARCH_EBSA110)                += ebsa110
 +machine-$(CONFIG_ARCH_EP93XX)         += ep93xx
 +machine-$(CONFIG_ARCH_GEMINI)         += gemini
 +machine-$(CONFIG_ARCH_H720X)          += h720x
 +machine-$(CONFIG_ARCH_HIGHBANK)               += highbank
 +machine-$(CONFIG_ARCH_INTEGRATOR)     += integrator
 +machine-$(CONFIG_ARCH_IOP13XX)                += iop13xx
 +machine-$(CONFIG_ARCH_IOP32X)         += iop32x
 +machine-$(CONFIG_ARCH_IOP33X)         += iop33x
 +machine-$(CONFIG_ARCH_IXP4XX)         += ixp4xx
 +machine-$(CONFIG_ARCH_KIRKWOOD)               += kirkwood
 +machine-$(CONFIG_ARCH_KS8695)         += ks8695
 +machine-$(CONFIG_ARCH_LPC32XX)                += lpc32xx
 +machine-$(CONFIG_ARCH_MMP)            += mmp
 +machine-$(CONFIG_ARCH_MSM)            += msm
 +machine-$(CONFIG_ARCH_MV78XX0)                += mv78xx0
 +machine-$(CONFIG_ARCH_MXC)            += imx
 +machine-$(CONFIG_ARCH_MXS)            += mxs
 +machine-$(CONFIG_ARCH_MVEBU)          += mvebu
 +machine-$(CONFIG_ARCH_NETX)           += netx
 +machine-$(CONFIG_ARCH_NOMADIK)                += nomadik
 +machine-$(CONFIG_ARCH_OMAP1)          += omap1
 +machine-$(CONFIG_ARCH_OMAP2PLUS)      += omap2
 +machine-$(CONFIG_ARCH_ORION5X)                += orion5x
 +machine-$(CONFIG_ARCH_PICOXCELL)      += picoxcell
 +machine-$(CONFIG_ARCH_PRIMA2)         += prima2
 +machine-$(CONFIG_ARCH_PXA)            += pxa
 +machine-$(CONFIG_ARCH_REALVIEW)               += realview
 +machine-$(CONFIG_ARCH_RPC)            += rpc
 +machine-$(CONFIG_ARCH_S3C24XX)                += s3c24xx s3c2412 s3c2440
 +machine-$(CONFIG_ARCH_S3C64XX)                += s3c64xx
 +machine-$(CONFIG_ARCH_S5P64X0)                += s5p64x0
 +machine-$(CONFIG_ARCH_S5PC100)                += s5pc100
 +machine-$(CONFIG_ARCH_S5PV210)                += s5pv210
 +machine-$(CONFIG_ARCH_EXYNOS)         += exynos
 +machine-$(CONFIG_ARCH_SA1100)         += sa1100
 +machine-$(CONFIG_ARCH_SHARK)          += shark
 +machine-$(CONFIG_ARCH_SHMOBILE)       += shmobile
 +machine-$(CONFIG_ARCH_TEGRA)          += tegra
 +machine-$(CONFIG_ARCH_U300)           += u300
 +machine-$(CONFIG_ARCH_U8500)          += ux500
 +machine-$(CONFIG_ARCH_VERSATILE)      += versatile
 +machine-$(CONFIG_ARCH_VEXPRESS)               += vexpress
 +machine-$(CONFIG_ARCH_VT8500)         += vt8500
 +machine-$(CONFIG_ARCH_W90X900)                += w90x900
 +machine-$(CONFIG_FOOTBRIDGE)          += footbridge
 +machine-$(CONFIG_ARCH_SOCFPGA)                += socfpga
 +machine-$(CONFIG_ARCH_SPEAR13XX)      += spear13xx
 +machine-$(CONFIG_ARCH_SPEAR3XX)               += spear3xx
 +machine-$(CONFIG_MACH_SPEAR600)               += spear6xx
 +machine-$(CONFIG_ARCH_ZYNQ)           += zynq
  
  # Platform directory name.  This list is sorted alphanumerically
  # by CONFIG_* macro name.