diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 21:08:17 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-03 21:08:17 -0500 |
commit | fd8a882b612de93b351996ed42a9557afc1f8c34 (patch) | |
tree | baadcaa7217cc40f41f04eb40c0d1236cf462716 /arch/mips/au1000/db1x00/init.c | |
parent | c8a4f06e4b27dba425ed49fa603d9257e4cd9ece (diff) | |
parent | 3b6efee9231e12fce09c94930bfc59f66f18d662 (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/mips/au1000/db1x00/init.c')
-rw-r--r-- | arch/mips/au1000/db1x00/init.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c index 4b9d5e46edb..41e0522f3cf 100644 --- a/arch/mips/au1000/db1x00/init.c +++ b/arch/mips/au1000/db1x00/init.c @@ -61,7 +61,17 @@ void __init prom_init(void) 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(); |