Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / mips / tx4938 / toshiba_rbtx4938 / prom.c

diff --git a/arch/mips/tx4938/toshiba_rbtx4938/prom.c b/arch/mips/tx4938/toshiba_rbtx4938/prom.c
index 69f21c1..1644bff 100644 (file)
--- a/arch/mips/tx4938/toshiba_rbtx4938/prom.c
+++ b/arch/mips/tx4938/toshiba_rbtx4938/prom.c
@@ -47,7 +47,6 @@ void __init prom_init(void)
 #ifndef CONFIG_TX4938_NAND_BOOT
        prom_init_cmdline();
 #endif
-       mips_machtype = MACH_TOSHIBA_RBTX4938;
 
        msize = tx4938_get_mem_size();
        add_memory_region(0, msize << 20, BOOT_MEM_RAM);