Merge ../linus

[linux-2.6-omap-h63xx.git] / arch / mips / au1000 / common / prom.c

diff --git a/arch/mips/au1000/common/prom.c b/arch/mips/au1000/common/prom.c
index b4b010a2fe36d2b8947a680b903666de8b2715c2..6fce60af005dc7be1704d660d6d4ecc1fdcacd47 100644 (file)
--- a/arch/mips/au1000/common/prom.c
+++ b/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]);
 }