Merge tag 'for-linus-20131112' of git://git.infradead.org/linux-mtd

[~andy/linux] / arch / arm / mach-u300 / core.c

diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 4f7ac2a114520f5fcb28a9e3a35a3f44a213b0a4..35670b15f28182299a94373cfd8fdae54c2f7e2f 100644 (file)
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -300,11 +300,11 @@ static void __init u300_init_check_chip(void)
 /* Forward declare this function from the watchdog */
 void coh901327_watchdog_reset(void);
 
-static void u300_restart(char mode, const char *cmd)
+static void u300_restart(enum reboot_mode mode, const char *cmd)
 {
        switch (mode) {
-       case 's':
-       case 'h':
+       case REBOOT_SOFT:
+       case REBOOT_HARD:
 #ifdef CONFIG_COH901327_WATCHDOG
                coh901327_watchdog_reset();
 #endif