Merge commit 'v2.6.35-rc3' into for-linus

1 files changed, 11 insertions, 6 deletions

diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c
index 85cfaf916fdc..9f9bb63616ad 100644
--- a/arch/sh/kernel/machvec.c
+++ b/arch/sh/kernel/machvec.c
@@ -118,6 +118,14 @@ void __init sh_mv_setup(void)
                 sh_mv.mv_##elem = generic_##elem; \
 } while (0)
 
+#ifdef CONFIG_HAS_IOPORT
+
+#ifdef P2SEG
+        __set_io_port_base(P2SEG);
+#else
+        __set_io_port_base(0);
+#endif
+
         mv_set(inb);    mv_set(inw);    mv_set(inl);
         mv_set(outb);   mv_set(outw);   mv_set(outl);
 
@@ -129,16 +137,13 @@ void __init sh_mv_setup(void)
 
         mv_set(ioport_map);
         mv_set(ioport_unmap);
+
+#endif
+
         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;
-
-#ifdef P2SEG
-        __set_io_port_base(P2SEG);
-#else
-        __set_io_port_base(0);
-#endif
 }