summaryrefslogtreecommitdiff
path: root/arch/mips/au1000/xxs1500/init.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor_core@ameritech.net>2005-09-10 05:14:47 +0400
committerDmitry Torokhov <dtor_core@ameritech.net>2005-09-10 05:14:47 +0400
commitd344c5e0856ad03278d8700b503762dbc8b86e12 (patch)
treea6d893a643470a3c2580a58f3228a55fa1fd1d82 /arch/mips/au1000/xxs1500/init.c
parent010988e888a0abbe7118635c1b33d049caae6b29 (diff)
parent87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff)
downloadlinux-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.xz
Manual merge with Linus
Diffstat (limited to 'arch/mips/au1000/xxs1500/init.c')
-rw-r--r--arch/mips/au1000/xxs1500/init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c
index 03f755291b51..f1c76533b6fc 100644
--- a/arch/mips/au1000/xxs1500/init.c
+++ b/arch/mips/au1000/xxs1500/init.c
@@ -55,7 +55,7 @@ void __init prom_init(void)
prom_envp = (char **) fw_arg2;
mips_machgroup = MACH_GROUP_ALCHEMY;
- mips_machtype = MACH_XXS1500; /* set the platform # */
+ mips_machtype = MACH_XXS1500; /* set the platform # */
prom_init_cmdline();