Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[sfrench/cifs-2.6.git] / arch / arm / mach-bcm / board_bcm2835.c

diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
index 0c1edfc98696da0e0bb7f4a18cdfbcdd27a9795d..8cff865ace04bf1c900676ebdacce9342d0f5036 100644 (file)
--- a/arch/arm/mach-bcm/board_bcm2835.c
+++ b/arch/arm/mach-bcm/board_bcm2835.c
@@ -15,15 +15,11 @@
 #include <linux/init.h>
 #include <linux/irqchip.h>
 #include <linux/of_address.h>
-#include <linux/clk/bcm2835.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-static void __init bcm2835_init(void)
-{
-       bcm2835_init_clocks();
-}
+#include "platsmp.h"
 
 static const char * const bcm2835_compat[] = {
 #ifdef CONFIG_ARCH_MULTI_V6
@@ -31,11 +27,12 @@ static const char * const bcm2835_compat[] = {
 #endif
 #ifdef CONFIG_ARCH_MULTI_V7
        "brcm,bcm2836",
+       "brcm,bcm2837",
 #endif
        NULL
 };
 
 DT_MACHINE_START(BCM2835, "BCM2835")
-       .init_machine = bcm2835_init,
-       .dt_compat = bcm2835_compat
+       .dt_compat = bcm2835_compat,
+       .smp = smp_ops(bcm2836_smp_ops),
 MACHINE_END