From c9b89ded60951def3682d1adcb7317afd584b3dc Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Fri, 27 Mar 2009 12:46:26 +0100
Subject: [PATCH] --- yaml --- r: 137635 b: refs/heads/master c:
 15a453a955f89f6545118770c669b52e925368bd h: refs/heads/master i:   137633:
 6e8af1d1974dd6798d4113dfcccf929ddde429c7   137631:
 633dfa8303cc9f0f6a041177974df3f8729674be v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/ide/ide-io-std.c | 7 +++++++
 trunk/drivers/ide/tx4938ide.c  | 2 ++
 trunk/drivers/ide/tx4939ide.c  | 2 ++
 trunk/include/linux/ide.h      | 7 -------
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 75c6c1c465cc..dfb72ecf05c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 443d18c80700da1f9a5a7cdf676f27ee4db6af6a
+refs/heads/master: 15a453a955f89f6545118770c669b52e925368bd
diff --git a/trunk/drivers/ide/ide-io-std.c b/trunk/drivers/ide/ide-io-std.c
index 45b43dd49cda..9a8da6744d93 100644
--- a/trunk/drivers/ide/ide-io-std.c
+++ b/trunk/drivers/ide/ide-io-std.c
@@ -2,6 +2,13 @@
 #include <linux/kernel.h>
 #include <linux/ide.h>
 
+#if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \
+    defined(CONFIG_PARISC) || defined(CONFIG_PPC) || defined(CONFIG_SPARC)
+#include <asm/ide.h>
+#else
+#include <asm-generic/ide_iops.h>
+#endif
+
 /*
  *	Conventional PIO operations for ATA devices
  */
diff --git a/trunk/drivers/ide/tx4938ide.c b/trunk/drivers/ide/tx4938ide.c
index d9095345f7ca..efade9e898b3 100644
--- a/trunk/drivers/ide/tx4938ide.c
+++ b/trunk/drivers/ide/tx4938ide.c
@@ -15,6 +15,8 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+
+#include <asm/ide.h>
 #include <asm/txx9/tx4938.h>
 
 static void tx4938ide_tune_ebusc(unsigned int ebus_ch,
diff --git a/trunk/drivers/ide/tx4939ide.c b/trunk/drivers/ide/tx4939ide.c
index 40b0812a045c..fb037a5e70b3 100644
--- a/trunk/drivers/ide/tx4939ide.c
+++ b/trunk/drivers/ide/tx4939ide.c
@@ -18,6 +18,8 @@
 #include <linux/io.h>
 #include <linux/scatterlist.h>
 
+#include <asm/ide.h>
+
 #define MODNAME	"tx4939ide"
 
 /* ATA Shadow Registers (8-bit except for Data which is 16-bit) */
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index b7d95f09cc2e..47878719c56b 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -193,13 +193,6 @@ static inline void ide_std_init_ports(hw_regs_t *hw,
 	hw->io_ports.ctl_addr = ctl_addr;
 }
 
-#if defined(CONFIG_ARM) || defined(CONFIG_M68K) || defined(CONFIG_MIPS) || \
-    defined(CONFIG_PARISC) || defined(CONFIG_PPC) || defined(CONFIG_SPARC)
-#include <asm/ide.h>
-#else
-#include <asm-generic/ide_iops.h>
-#endif
-
 #define MAX_HWIFS	10
 
 /*