Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[pandora-kernel.git] / arch / mips / jazz / setup.c

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index f136c8a..f60524e 100644 (file)
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -76,8 +76,7 @@ void __init plat_mem_setup(void)
 
        set_io_port_base(JAZZ_PORT_BASE);
 #ifdef CONFIG_EISA
-       if (mips_machtype == MACH_MIPS_MAGNUM_4000)
-               EISA_bus = 1;
+       EISA_bus = 1;
 #endif
 
        /* request I/O space for devices used on all i[345]86 PCs */