Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[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 4b9d5e4..4d7bcfc 100644 (file)
--- a/arch/mips/au1000/db1x00/init.c
+++ b/arch/mips/au1000/db1x00/init.c
@@ -33,7 +33,6 @@
 #include <linux/bootmem.h>
 #include <asm/addrspace.h>
 #include <asm/bootinfo.h>
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
 
@@ -60,8 +59,16 @@ void __init prom_init(void)
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
 
-       mips_machgroup = MACH_GROUP_ALCHEMY;
-       mips_machtype = MACH_DB1000;    /* set the platform # */
+       /* 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();