From: Bjorn Helgaas <bjorn.helgaas@hp.com>

CONFIG_IDE_MAX_HWIFS is a generic thing, no need to have it duplicated by
every arch that uses it.

Previous posts elicited no responses:
    http://www.uwsg.iu.edu/hypermail/linux/kernel/0508.3/0111.html
    http://www.uwsg.iu.edu/hypermail/linux/kernel/0508.3/1299.html

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-alpha/ide.h |    4 ----
 include/asm-sh/ide.h    |    4 ----
 include/asm-sh64/ide.h  |    4 ----
 include/linux/ide.h     |    4 ++++
 4 files changed, 4 insertions(+), 12 deletions(-)

diff -puN include/asm-alpha/ide.h~ide-move-config_ide_max_hwifs-into-linux-ideh include/asm-alpha/ide.h
--- devel/include/asm-alpha/ide.h~ide-move-config_ide_max_hwifs-into-linux-ideh	2005-09-16 16:02:04.000000000 -0700
+++ devel-akpm/include/asm-alpha/ide.h	2005-09-16 16:02:04.000000000 -0700
@@ -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 -puN include/asm-sh64/ide.h~ide-move-config_ide_max_hwifs-into-linux-ideh include/asm-sh64/ide.h
--- devel/include/asm-sh64/ide.h~ide-move-config_ide_max_hwifs-into-linux-ideh	2005-09-16 16:02:04.000000000 -0700
+++ devel-akpm/include/asm-sh64/ide.h	2005-09-16 16:02:04.000000000 -0700
@@ -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 -puN include/asm-sh/ide.h~ide-move-config_ide_max_hwifs-into-linux-ideh include/asm-sh/ide.h
--- devel/include/asm-sh/ide.h~ide-move-config_ide_max_hwifs-into-linux-ideh	2005-09-16 16:02:04.000000000 -0700
+++ devel-akpm/include/asm-sh/ide.h	2005-09-16 16:02:04.000000000 -0700
@@ -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 -puN include/linux/ide.h~ide-move-config_ide_max_hwifs-into-linux-ideh include/linux/ide.h
--- devel/include/linux/ide.h~ide-move-config_ide_max_hwifs-into-linux-ideh	2005-09-16 16:02:04.000000000 -0700
+++ devel-akpm/include/linux/ide.h	2005-09-16 16:02:04.000000000 -0700
@@ -266,6 +266,10 @@ static inline void ide_std_init_ports(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)
_