Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 8 deletions

diff --git a/arch/sh/boards/mach-edosk7705/setup.c b/arch/sh/boards/mach-edosk7705/setup.c
index ab3f47bffdf3..d59225e26fb9 100644
--- a/arch/sh/boards/mach-edosk7705/setup.c
+++ b/arch/sh/boards/mach-edosk7705/setup.c
@@ -9,6 +9,7 @@
  * board by S. Dunn, 2003.
  */
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <asm/machvec.h>
 #include <mach/edosk7705.h>
 
@@ -26,18 +27,10 @@ static struct sh_machine_vector mv_edosk7705 __initmv = {
         .mv_nr_irqs             = 80,
 
         .mv_inb                 = sh_edosk7705_inb,
-        .mv_inl                 = sh_edosk7705_inl,
         .mv_outb                = sh_edosk7705_outb,
-        .mv_outl                = sh_edosk7705_outl,
-
-        .mv_inl_p               = sh_edosk7705_inl,
-        .mv_outl_p              = sh_edosk7705_outl,
 
         .mv_insb                = sh_edosk7705_insb,
-        .mv_insl                = sh_edosk7705_insl,
         .mv_outsb               = sh_edosk7705_outsb,
-        .mv_outsl               = sh_edosk7705_outsl,
 
-        .mv_isa_port2addr       = sh_edosk7705_isa_port2addr,
         .mv_init_irq            = sh_edosk7705_init_irq,
 };