diff options
| author | Bjorn Helgaas | 2006-02-03 12:04:53 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-02-03 17:32:11 +0100 |
| commit | d57d39c81271a0808eabcf7bdc409312b5262b69 (patch) | |
| tree | 7c3bd49624969c0d4e67a75acc8676945a900cc3 | |
| parent | [PATCH] piix: add Intel ICH8M device IDs (diff) | |
| download | kernel-qcow2-linux-d57d39c81271a0808eabcf7bdc409312b5262b69.tar.gz kernel-qcow2-linux-d57d39c81271a0808eabcf7bdc409312b5262b69.tar.xz kernel-qcow2-linux-d57d39c81271a0808eabcf7bdc409312b5262b69.zip | |
[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>
| -rw-r--r-- | drivers/ide/Kconfig | 4 | ||||
| -rw-r--r-- | include/asm-ia64/ide.h | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 1c81174595b3..b26212a4ecf8 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -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 --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h index e62b95301d51..93f45c5f189f 100644 --- a/include/asm-ia64/ide.h +++ b/include/asm-ia64/ide.h @@ -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) |