Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / arch / mips / sni / sniprom.c

diff --git a/arch/mips/sni/sniprom.c b/arch/mips/sni/sniprom.c
index 00a03a6..eff4b89 100644 (file)
--- a/arch/mips/sni/sniprom.c
+++ b/arch/mips/sni/sniprom.c
@@ -19,6 +19,7 @@
 #include <asm/addrspace.h>
 #include <asm/sni.h>
 #include <asm/mipsprom.h>
+#include <asm/mipsregs.h>
 #include <asm/bootinfo.h>
 
 /* special SNI prom calls */
@@ -44,7 +45,7 @@ void prom_putchar(char c)
 static char *(*__prom_getenv)(char *)     = (char *(*)(char *))PROM_ENTRY(PROM_GETENV);
 static void (*__prom_get_memconf)(void *) = (void (*)(void *))PROM_ENTRY(PROM_GET_MEMCONF);
 
-char *prom_getenv (char *s)
+char *prom_getenv(char *s)
 {
        return __prom_getenv(s);
 }
@@ -71,7 +72,7 @@ const char *get_system_type(void)
 #define SNI_IDPROM_SIZE        0x1000
 
 #ifdef DEBUG
-static void sni_idprom_dump(void)
+static void __init sni_idprom_dump(void)
 {
        int     i;
 
@@ -88,7 +89,7 @@ static void sni_idprom_dump(void)
 }
 #endif
 
-static void sni_mem_init(void )
+static void __init sni_mem_init(void )
 {
        int i, memsize;
        struct membank {
@@ -130,9 +131,9 @@ static void __init sni_console_setup(void)
        int port;
        static char options[8];
 
-       cdev = prom_getenv ("console_dev");
+       cdev = prom_getenv("console_dev");
        if (strncmp (cdev, "tty", 3) == 0) {
-               ctype = prom_getenv ("console");
+               ctype = prom_getenv("console");
                switch (*ctype) {
                default:
                case 'l':
@@ -232,7 +233,7 @@ void __init prom_init(void)
                systype = "RM300-Exx";
                break;
        }
-       pr_debug("Found SNI brdtype %02x name %s\n", sni_brd_type,systype);
+       pr_debug("Found SNI brdtype %02x name %s\n", sni_brd_type, systype);
 
 #ifdef DEBUG
        sni_idprom_dump();