Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[sfrench/cifs-2.6.git] / arch / sh / kernel / machvec.c

diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c
index cbce639b108a6144351f39b85212eb00a48f433a..1652340ba3f2abe07ce27ca818deb76d19e282f6 100644 (file)
--- a/arch/sh/kernel/machvec.c
+++ b/arch/sh/kernel/machvec.c
@@ -135,5 +135,9 @@ void __init sh_mv_setup(void)
        if (!sh_mv.mv_nr_irqs)
                sh_mv.mv_nr_irqs = NR_IRQS;
 
+#ifdef P2SEG
        __set_io_port_base(P2SEG);
+#else
+       __set_io_port_base(0);
+#endif
 }