浏览代码

[MIPS] Sort out missuse of __init for prom_getcmdline()

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle 18 年之前
父节点
当前提交
c21e6d65f7
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      arch/mips/au1000/common/prom.c
  2. 1 1
      arch/mips/au1000/common/setup.c
  3. 1 1
      drivers/net/au1000_eth.c

+ 1 - 1
arch/mips/au1000/common/prom.c

@@ -47,7 +47,7 @@ extern int prom_argc;
 extern char **prom_argv, **prom_envp;
 
 
-char * prom_getcmdline(void)
+char * __init_or_module prom_getcmdline(void)
 {
 	return &(arcs_cmdline[0]);
 }

+ 1 - 1
arch/mips/au1000/common/setup.c

@@ -43,7 +43,7 @@
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/time.h>
 
-extern char * __init prom_getcmdline(void);
+extern char * prom_getcmdline(void);
 extern void __init board_setup(void);
 extern void au1000_restart(char *);
 extern void au1000_halt(void);

+ 1 - 1
drivers/net/au1000_eth.c

@@ -102,7 +102,7 @@ static void enable_mac(struct net_device *, int);
 // externs
 extern int get_ethernet_addr(char *ethernet_addr);
 extern void str2eaddr(unsigned char *ea, unsigned char *str);
-extern char * __init prom_getcmdline(void);
+extern char * prom_getcmdline(void);
 
 /*
  * Theory of operation