Merge remote-tracking branch 'mkp-scsi/fixes' into fixes

[karo-tx-linux.git] / arch / sh / kernel / machvec.c

diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c
index 3d722e49db0826a843ee1e5c03a9fe09e90da236..ec05f491c3471ea1e5e57a0ef9b93409f996c008 100644 (file)
--- a/arch/sh/kernel/machvec.c
+++ b/arch/sh/kernel/machvec.c
@@ -121,7 +121,4 @@ void __init sh_mv_setup(void)
        mv_set(irq_demux);
        mv_set(mode_pins);
        mv_set(mem_init);
-
-       if (!sh_mv.mv_nr_irqs)
-               sh_mv.mv_nr_irqs = NR_IRQS;
 }