From c41731c652a4afb08297b0d37143d07748bcf1b0 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 31 Oct 2006 13:41:59 +0000
Subject: [PATCH] --- yaml --- r: 40555 b: refs/heads/master c:
 c21e6d65f70d64b359a37545592f39e28074864e h: refs/heads/master i:   40553:
 efb5a5b70922c26b54dd493c1dc39fa579eb6135   40551:
 279d6ab76d520cd94f2c5bc890b3616870f9b341 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/mips/au1000/common/prom.c  | 2 +-
 trunk/arch/mips/au1000/common/setup.c | 2 +-
 trunk/drivers/net/au1000_eth.c        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index dd1a12221bea..953c7d0d3971 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8f05de54055e90e6d58e45866f84ecdb0b48acd
+refs/heads/master: c21e6d65f70d64b359a37545592f39e28074864e
diff --git a/trunk/arch/mips/au1000/common/prom.c b/trunk/arch/mips/au1000/common/prom.c
index b4b010a2fe36..6fce60af005d 100644
--- a/trunk/arch/mips/au1000/common/prom.c
+++ b/trunk/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]);
 }
diff --git a/trunk/arch/mips/au1000/common/setup.c b/trunk/arch/mips/au1000/common/setup.c
index 377ae0d8ff00..919172db560c 100644
--- a/trunk/arch/mips/au1000/common/setup.c
+++ b/trunk/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);
diff --git a/trunk/drivers/net/au1000_eth.c b/trunk/drivers/net/au1000_eth.c
index 4873dc610d22..7db3c8af0894 100644
--- a/trunk/drivers/net/au1000_eth.c
+++ b/trunk/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