Fresh pull from upstream
[librecmc/librecmc.git] / target / linux / ramips / patches-4.4 / 0068-fix-ralink-prom.c
1 --- a/arch/mips/ralink/prom.c
2 +++ b/arch/mips/ralink/prom.c
3 @@ -30,8 +30,10 @@ const char *get_system_type(void)
4         return soc_info.sys_type;
5  }
6  
7 -static __init void prom_init_cmdline(int argc, char **argv)
8 +static __init void prom_init_cmdline(void)
9  {
10 +       int argc;
11 +       char **argv;
12         int i;
13  
14         pr_debug("prom: fw_arg0=%08x fw_arg1=%08x fw_arg2=%08x fw_arg3=%08x\n",
15 @@ -60,14 +62,11 @@ static __init void prom_init_cmdline(int
16  
17  void __init prom_init(void)
18  {
19 -       int argc;
20 -       char **argv;
21 -
22         prom_soc_init(&soc_info);
23  
24         pr_info("SoC Type: %s\n", get_system_type());
25  
26 -       prom_init_cmdline(argc, argv);
27 +       prom_init_cmdline();
28  }
29  
30  void __init prom_free_prom_memory(void)