Merge branch 'linus' into x86/cleanups

[linux-2.6-omap-h63xx.git] / arch / mips / basler / excite / excite_prom.c

diff --git a/arch/mips/basler/excite/excite_prom.c b/arch/mips/basler/excite/excite_prom.c
index 2d752c2f6e5902de96faef7915b4eb5a51d9d72b..68d8bc597e347a83ce17a356ccaf32864c05f68d 100644 (file)
--- a/arch/mips/basler/excite/excite_prom.c
+++ b/arch/mips/basler/excite/excite_prom.c
@@ -135,8 +135,6 @@ void __init prom_init(void)
 #ifdef CONFIG_64BIT
 #      error 64 bit support not implemented
 #endif /* CONFIG_64BIT */
-
-       mips_machtype = MACH_TITAN_EXCITE;
 }
 
 /* This is called from free_initmem(), so we need to provide it */