commit d30fe6272183f3cc8b9f3f111cd36271332e4cec
author Markus Mayer <markus.mayer@linaro.org> Thu Feb 20 16:16:11 2014 -0800
committer Stephen Warren <swarren@wwwdotorg.org> Mon Feb 24 19:42:35 2014 -0700
tree b687736f4e0c2fc441c40db4dc917c7b1e47730c
parent 38dbfb59d1175ef458d006556061adeaa8751b72

ARM: bcm2835: Move to mach-bcm directory

Move the bcm2835 board file into the mach-bcm directory. This allows us
to get rid of the mach-bcm2835 directory with the associated Kconfig
and Makefile.

Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
[swarren, adjust defconfig so ARCH_BCM2835 still gets enabled]
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>

arch/arm/configs/bcm2835_defconfig

diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig
index f43392d..0302d29 100644
--- a/arch/arm/configs/bcm2835_defconfig
+++ b/arch/arm/configs/bcm2835_defconfig
@@ -31,6 +31,7 @@
 CONFIG_JUMP_LABEL=y
 CONFIG_ARCH_MULTI_V6=y
 # CONFIG_ARCH_MULTI_V7 is not set
+CONFIG_ARCH_BCM=y
 CONFIG_ARCH_BCM2835=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y