Merge branch 'for-rmk' of git://git.android.com/kernel into devel

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c
index 129b2cfd18a8..c1ea41e5812a 100644
--- a/arch/sh/kernel/machvec.c
+++ b/arch/sh/kernel/machvec.c
@@ -14,6 +14,7 @@
 #include <linux/string.h>
 #include <asm/machvec.h>
 #include <asm/sections.h>
+#include <asm/setup.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
@@ -125,9 +126,6 @@ void __init sh_mv_setup(void)
         mv_set(insb);   mv_set(insw);   mv_set(insl);
         mv_set(outsb);  mv_set(outsw);  mv_set(outsl);
 
-        mv_set(readb);  mv_set(readw);  mv_set(readl);
-        mv_set(writeb); mv_set(writew); mv_set(writel);
-
         mv_set(ioport_map);
         mv_set(ioport_unmap);
         mv_set(irq_demux);