Commit d57d39c8 authored Feb 03, 2006 by Bjorn Helgaas Committed by Linus Torvalds Feb 03, 2006

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

parent b7bed9ec

drivers/ide/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ if IDE

		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

include/asm-ia64/ide.h

+0 −8

Original line number	Diff line number	Diff line
		@@ -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)

Admin message