Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / arch / mips / au1000 / db1x00 / init.c

diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c
index 4d7bcfc..e822c12 100644 (file)
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
@@ -31,15 +31,13 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/bootmem.h>
-#include <asm/addrspace.h>
-#include <asm/bootinfo.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
 
-int prom_argc;
-char **prom_argv, **prom_envp;
-extern void  __init prom_init_cmdline(void);
-extern char *prom_getenv(char *envname);
+#include <asm/addrspace.h>
+#include <asm/bootinfo.h>
+
+#include <prom.h>
 
 const char *get_system_type(void)
 {
@@ -59,17 +57,6 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       /* Set the platform # */
-#if    defined(CONFIG_MIPS_DB1550)
-       mips_machtype = MACH_DB1550;
-#elif  defined(CONFIG_MIPS_DB1500)
-       mips_machtype = MACH_DB1500;
-#elif  defined(CONFIG_MIPS_DB1100)
-       mips_machtype = MACH_DB1100;
-#else
-       mips_machtype = MACH_DB1000;
-#endif
-
        prom_init_cmdline();
 
        memsize_str = prom_getenv("memsize");