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

There's no reason MAX_HWIFS needs to be ia64-specific, so set MAX_HWIFS
from CONFIG_IDE_MAX_HWIFS.

This reduces the default from 10 to 4, but I don't think that's a problem.

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

 drivers/ide/Kconfig    |    4 ++--
 include/asm-ia64/ide.h |    8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff -puN drivers/ide/Kconfig~ia64-drop-arch-specific-ide-max_hwifs-definition drivers/ide/Kconfig
--- devel/drivers/ide/Kconfig~ia64-drop-arch-specific-ide-max_hwifs-definition	2005-11-07 19:04:19.000000000 -0800
+++ devel-akpm/drivers/ide/Kconfig	2005-11-07 19:04:19.000000000 -0800
@@ -52,9 +52,9 @@ config IDE
 
 if IDE
 
-config IDE_MAX_HWIFS 
+config IDE_MAX_HWIFS
 	int "Max IDE interfaces"
-	depends on ALPHA || SUPERH
+	depends on ALPHA || SUPERH || IA64
 	default 4
 	help
 	  This is the maximum number of IDE hardware interfaces that will
diff -puN include/asm-ia64/ide.h~ia64-drop-arch-specific-ide-max_hwifs-definition include/asm-ia64/ide.h
--- devel/include/asm-ia64/ide.h~ia64-drop-arch-specific-ide-max_hwifs-definition	2005-11-07 19:04:19.000000000 -0800
+++ devel-akpm/include/asm-ia64/ide.h	2005-11-07 19:04:19.000000000 -0800
@@ -17,14 +17,6 @@
 
 #include <linux/irq.h>
 
-#ifndef MAX_HWIFS
-# ifdef CONFIG_PCI
-#define MAX_HWIFS	10
-# else
-#define MAX_HWIFS	6
-# endif
-#endif
-
 #define IDE_ARCH_OBSOLETE_DEFAULTS
 
 static inline int ide_default_irq(unsigned long base)
_