[PATCH] ide: move CONFIG_IDE_MAX_HWIFS into linux/ide.h

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

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index 68934a25931f7a7928f5ec1a8133027a8bbbef43..6126afe2738078558e54b8c2f0815294e0b8eb80 100644 (file)
--- a/include/asm-alpha/ide.h
+++ b/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/include/asm-sh/ide.h b/include/asm-sh/ide.h
index f42cf3977a5748890a1721f4b5ce64a45658e9d2..711dad4cb48ba322b929db9dc51be586de01352e 100644 (file)
--- a/include/asm-sh/ide.h
+++ b/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/include/asm-sh64/ide.h b/include/asm-sh64/ide.h
index 6fd514daa1ba30340a4c150885d8cbe908967192..852f50afe39cae1910815809c84834ae5b116b01 100644 (file)
--- a/include/asm-sh64/ide.h
+++ b/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/include/linux/ide.h b/include/linux/ide.h
index e0cf4811da0845124180a2e4bda9df6aa99ce976..77ae55d4c13cb5e71c8d9e1524e1a98dc5e4e352 100644 (file)
--- a/include/linux/ide.h
+++ b/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)