add new prom.h for AU1x00

Add new prom.h for AU1x00.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

2 files changed, 13 insertions, 15 deletions

diff --git a/arch/mips/au1000/common/prom.c b/arch/mips/au1000/common/prom.c
index 5d6ddf1ed7a6..90d70695aa60 100644
--- a/arch/mips/au1000/common/prom.c
+++ b/arch/mips/au1000/common/prom.c
@@ -33,7 +33,6 @@
  *  with this program; if not, write  to the Free Software Foundation, Inc.,
  *  675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -41,18 +40,16 @@
 
 #include <asm/bootinfo.h>
 
-/* #define DEBUG_CMDLINE */
-
-extern int prom_argc;
-extern char **prom_argv, **prom_envp;
-
+int prom_argc;
+char **prom_argv;
+char **prom_envp;
 
 char * __init_or_module prom_getcmdline(void)
 {
         return &(arcs_cmdline[0]);
 }
 
-void  prom_init_cmdline(void)
+void prom_init_cmdline(void)
 {
         char *cp;
         int actr;
@@ -61,7 +58,7 @@ void  prom_init_cmdline(void)
 
         cp = &(arcs_cmdline[0]);
         while(actr < prom_argc) {
-                strcpy(cp, prom_argv[actr]);
+                strcpy(cp, prom_argv[actr]);
                 cp += strlen(prom_argv[actr]);
                 *cp++ = ' ';
                 actr++;
@@ -70,10 +67,8 @@ void  prom_init_cmdline(void)
                 --cp;
         if (prom_argc > 1)
                 *cp = '\0';
-
 }
 
-
 char *prom_getenv(char *envname)
 {
         /*
@@ -95,17 +90,19 @@ char *prom_getenv(char *envname)
                 }
                 env++;
         }
+
         return NULL;
 }
 
 static inline unsigned char str2hexnum(unsigned char c)
 {
-        if(c >= '0' && c <= '9')
+        if (c >= '0' && c <= '9')
                 return c - '0';
-        if(c >= 'a' && c <= 'f')
+        if (c >= 'a' && c <= 'f')
                 return c - 'a' + 10;
-        if(c >= 'A' && c <= 'F')
+        if (c >= 'A' && c <= 'F')
                 return c - 'A' + 10;
+
         return 0; /* foo */
 }
 
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c
index b212c0726125..a90d425d4651 100644
--- a/arch/mips/au1000/common/setup.c
+++ b/arch/mips/au1000/common/setup.c
@@ -40,10 +40,11 @@
 #include <asm/mipsregs.h>
 #include <asm/reboot.h>
 #include <asm/pgtable.h>
-#include <asm/mach-au1x00/au1000.h>
 #include <asm/time.h>
 
-extern char * prom_getcmdline(void);
+#include <au1000.h>
+#include <prom.h>
+
 extern void __init board_setup(void);
 extern void au1000_restart(char *);
 extern void au1000_halt(void);