[PATCH] ia64: drop arch-specific IDE MAX_HWIFS definition

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>
Acked-by: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Bjorn Helgaas 2006-02-03 03:04:53 -08:00 committed by Linus Torvalds
parent b7bed9ec44
commit d57d39c812
2 changed files with 2 additions and 10 deletions

View File

@ -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

View File

@ -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)