Merge tag 'llvmlinux-for-v3.18' of git://git.linuxfoundation.org/llvmlinux/kernel

[sfrench/cifs-2.6.git] / drivers / power / reset / xgene-reboot.c

diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c
index ecd55f81b9d1eca1a7a6307597dfe7d862f0f892..6b49be6867ab01f174de34cd28759951c61e7a2f 100644 (file)
--- a/drivers/power/reset/xgene-reboot.c
+++ b/drivers/power/reset/xgene-reboot.c
@@ -40,7 +40,7 @@ struct xgene_reboot_context {
 
 static struct xgene_reboot_context *xgene_restart_ctx;
 
-static void xgene_restart(char str, const char *cmd)
+static void xgene_restart(enum reboot_mode mode, const char *cmd)
 {
        struct xgene_reboot_context *ctx = xgene_restart_ctx;
        unsigned long timeout;