Commit d57d39c8 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds

[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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: default avatarBartlomiej 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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b7bed9ec
...@@ -54,7 +54,7 @@ if IDE ...@@ -54,7 +54,7 @@ if IDE
config IDE_MAX_HWIFS config IDE_MAX_HWIFS
int "Max IDE interfaces" int "Max IDE interfaces"
depends on ALPHA || SUPERH depends on ALPHA || SUPERH || IA64
default 4 default 4
help help
This is the maximum number of IDE hardware interfaces that will This is the maximum number of IDE hardware interfaces that will
......
...@@ -17,14 +17,6 @@ ...@@ -17,14 +17,6 @@
#include <linux/irq.h> #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 #define IDE_ARCH_OBSOLETE_DEFAULTS
static inline int ide_default_irq(unsigned long base) static inline int ide_default_irq(unsigned long base)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment