Merge tag 'bcm2835-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/multiplatform

From Stephen Warren <swarren@wwwdotorg.org>:

ARM: bcm2835: convert to multi-platform

This branch (patch) converts BCM2835 to support being built into a
multi-platform single zImage. This mostly entails a few small Kconfig
tweaks, move the earlyprintk implementation to the standard multi-
platform location, and deleting some unnecessary files.

* tag 'bcm2835-for-3.10-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
  ARM: bcm2835: convert to multi-platform

Conflicts:
	arch/arm/Kconfig
	arch/arm/Kconfig.debug

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 2 insertions, 20 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6423b587fa23..e4bbc8bca03c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -361,26 +361,6 @@ config ARCH_AT91
           This enables support for systems based on Atmel
           AT91RM9200 and AT91SAM9* processors.
 
-config ARCH_BCM2835
-        bool "Broadcom BCM2835 family"
-        select ARCH_REQUIRE_GPIOLIB
-        select ARM_AMBA
-        select ARM_ERRATA_411920
-        select ARM_TIMER_SP804
-        select CLKDEV_LOOKUP
-        select CLKSRC_OF
-        select COMMON_CLK
-        select CPU_V6
-        select GENERIC_CLOCKEVENTS
-        select MULTI_IRQ_HANDLER
-        select PINCTRL
-        select PINCTRL_BCM2835
-        select SPARSE_IRQ
-        select USE_OF
-        help
-          This enables support for the Broadcom BCM2835 SoC. This SoC is
-          use in the Raspberry Pi, and Roku 2 devices.
-
 config ARCH_CLPS711X
         bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
         select ARCH_REQUIRE_GPIOLIB
@@ -981,6 +961,8 @@ source "arch/arm/mach-at91/Kconfig"
 
 source "arch/arm/mach-bcm/Kconfig"
 
+source "arch/arm/mach-bcm2835/Kconfig"
+
 source "arch/arm/mach-clps711x/Kconfig"
 
 source "arch/arm/mach-cns3xxx/Kconfig"