From 06dd9e0c30f5ecd9e472cfdc0e44fd0b375a67aa Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date: Wed, 9 Nov 2005 22:58:07 +0100
Subject: [PATCH] --- yaml --- r: 13676 b: refs/heads/master c:
 83ae20c849f1bff32100fa8584408dca99ce4a62 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/asm-alpha/ide.h | 4 ----
 trunk/include/asm-sh/ide.h    | 4 ----
 trunk/include/asm-sh64/ide.h  | 4 ----
 trunk/include/linux/ide.h     | 4 ++++
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 9ec5158a7ee5..6646e147629e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4349d5cdf28d46c22d467079e80ee9695dcec0ad
+refs/heads/master: 83ae20c849f1bff32100fa8584408dca99ce4a62
diff --git a/trunk/include/asm-alpha/ide.h b/trunk/include/asm-alpha/ide.h
index 68934a25931f..6126afe27380 100644
--- a/trunk/include/asm-alpha/ide.h
+++ b/trunk/include/asm-alpha/ide.h
@@ -15,10 +15,6 @@
 
 #include <linux/config.h>
 
-#ifndef MAX_HWIFS
-#define MAX_HWIFS	CONFIG_IDE_MAX_HWIFS
-#endif
-
 #define IDE_ARCH_OBSOLETE_DEFAULTS
 
 static inline int ide_default_irq(unsigned long base)
diff --git a/trunk/include/asm-sh/ide.h b/trunk/include/asm-sh/ide.h
index f42cf3977a57..711dad4cb48b 100644
--- a/trunk/include/asm-sh/ide.h
+++ b/trunk/include/asm-sh/ide.h
@@ -16,10 +16,6 @@
 
 #include <linux/config.h>
 
-#ifndef MAX_HWIFS
-#define MAX_HWIFS	CONFIG_IDE_MAX_HWIFS
-#endif
-
 #define ide_default_io_ctl(base)	(0)
 
 #include <asm-generic/ide_iops.h>
diff --git a/trunk/include/asm-sh64/ide.h b/trunk/include/asm-sh64/ide.h
index 6fd514daa1ba..852f50afe39c 100644
--- a/trunk/include/asm-sh64/ide.h
+++ b/trunk/include/asm-sh64/ide.h
@@ -17,10 +17,6 @@
 
 #include <linux/config.h>
 
-#ifndef MAX_HWIFS
-#define MAX_HWIFS	CONFIG_IDE_MAX_HWIFS
-#endif
-
 /* Without this, the initialisation of PCI IDE cards end up calling
  * ide_init_hwif_ports, which won't work. */
 #ifdef CONFIG_BLK_DEV_IDEPCI
diff --git a/trunk/include/linux/ide.h b/trunk/include/linux/ide.h
index e0cf4811da08..77ae55d4c13c 100644
--- a/trunk/include/linux/ide.h
+++ b/trunk/include/linux/ide.h
@@ -267,6 +267,10 @@ static inline void ide_std_init_ports(hw_regs_t *hw,
 
 #include <asm/ide.h>
 
+#ifndef MAX_HWIFS
+#define MAX_HWIFS	CONFIG_IDE_MAX_HWIFS
+#endif
+
 /* needed on alpha, x86/x86_64, ia64, mips, ppc32 and sh */
 #ifndef IDE_ARCH_OBSOLETE_DEFAULTS
 # define ide_default_io_base(index)	(0)