Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / arch / mips / ralink / prom.c

diff --git a/arch/mips/ralink/prom.c b/arch/mips/ralink/prom.c
index 5a73c5e142211d484cc0589cc3ca7f9030953301..23198c9050e5c9a042e23e59d006457f6c0b98b7 100644 (file)
--- a/arch/mips/ralink/prom.c
+++ b/arch/mips/ralink/prom.c
@@ -30,8 +30,10 @@ const char *get_system_type(void)
        return soc_info.sys_type;
 }
 
-static __init void prom_init_cmdline(int argc, char **argv)
+static __init void prom_init_cmdline(void)
 {
+       int argc;
+       char **argv;
        int i;
 
        pr_debug("prom: fw_arg0=%08x fw_arg1=%08x fw_arg2=%08x fw_arg3=%08x\n",
@@ -60,14 +62,11 @@ static __init void prom_init_cmdline(int argc, char **argv)
 
 void __init prom_init(void)
 {
-       int argc;
-       char **argv;
-
        prom_soc_init(&soc_info);
 
        pr_info("SoC Type: %s\n", get_system_type());
 
-       prom_init_cmdline(argc, argv);
+       prom_init_cmdline();
 }
 
 void __init prom_free_prom_memory(void)