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

1 files changed, 10 insertions, 4 deletions

diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c
index d007e7f66598..c79346679244 100644
--- a/drivers/ide/q40ide.c
+++ b/drivers/ide/q40ide.c
@@ -16,6 +16,8 @@
 #include <linux/blkdev.h>
 #include <linux/ide.h>
 
+#include <asm/ide.h>
+
     /*
      *  Bases of the IDE interfaces
      */
@@ -77,8 +79,10 @@ static void q40ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd,
 {
         unsigned long data_addr = drive->hwif->io_ports.data_addr;
 
-        if (drive->media == ide_disk && cmd && (cmd->tf_flags & IDE_TFLAG_FS))
-                return insw(data_addr, buf, (len + 1) / 2);
+        if (drive->media == ide_disk && cmd && (cmd->tf_flags & IDE_TFLAG_FS)) {
+                __ide_mm_insw(data_addr, buf, (len + 1) / 2);
+                return;
+        }
 
         raw_insw_swapw((u16 *)data_addr, buf, (len + 1) / 2);
 }
@@ -88,8 +92,10 @@ static void q40ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd,
 {
         unsigned long data_addr = drive->hwif->io_ports.data_addr;
 
-        if (drive->media == ide_disk && cmd && (cmd->tf_flags & IDE_TFLAG_FS))
-                return outsw(data_addr, buf, (len + 1) / 2);
+        if (drive->media == ide_disk && cmd && (cmd->tf_flags & IDE_TFLAG_FS)) {
+                __ide_mm_outsw(data_addr, buf, (len + 1) / 2);
+                return;
+        }
 
         raw_outsw_swapw((u16 *)data_addr, buf, (len + 1) / 2);
 }