Merge tag 'char-misc-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

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

diff --git a/arch/arm/mach-highbank/system.c b/arch/arm/mach-highbank/system.c
index 37d8384dcf1923bbae0d21a812784bc8037df8b8..2df5870b7583a8592c162c834f84eb2bff2f4f50 100644 (file)
--- a/arch/arm/mach-highbank/system.c
+++ b/arch/arm/mach-highbank/system.c
@@ -15,13 +15,14 @@
  */
 #include <linux/io.h>
 #include <asm/proc-fns.h>
+#include <linux/reboot.h>
 
 #include "core.h"
 #include "sysregs.h"
 
-void highbank_restart(char mode, const char *cmd)
+void highbank_restart(enum reboot_mode mode, const char *cmd)
 {
-       if (mode == 'h')
+       if (mode == REBOOT_HARD)
                highbank_set_pwr_hard_reset();
        else
                highbank_set_pwr_soft_reset();