Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

[karo-tx-linux.git] / arch / arm / mach-bcm2835 / bcm2835.c

diff --git a/arch/arm/mach-bcm2835/bcm2835.c b/arch/arm/mach-bcm2835/bcm2835.c
index 740fa9ebe249ab14de612aefb0e24612a1877757..40686d7ef500223765a1a08f6beccfad9a2847f6 100644 (file)
--- a/arch/arm/mach-bcm2835/bcm2835.c
+++ b/arch/arm/mach-bcm2835/bcm2835.c
@@ -53,7 +53,7 @@ static void bcm2835_setup_restart(void)
        WARN(!wdt_regs, "failed to remap watchdog regs");
 }
 
-static void bcm2835_restart(char mode, const char *cmd)
+static void bcm2835_restart(enum reboot_mode mode, const char *cmd)
 {
        u32 val;
 
@@ -91,7 +91,7 @@ static void bcm2835_power_off(void)
        writel_relaxed(val, wdt_regs + PM_RSTS);
 
        /* Continue with normal reset mechanism */
-       bcm2835_restart(0, "");
+       bcm2835_restart(REBOOT_HARD, "");
 }
 
 static struct map_desc io_map __initdata = {