From 83ae20c849f1bff32100fa8584408dca99ce4a62 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Wed, 9 Nov 2005 22:58:07 +0100 Subject: [PATCH] [PATCH] ide: move CONFIG_IDE_MAX_HWIFS into linux/ide.h CONFIG_IDE_MAX_HWIFS is a generic thing, no need to have it duplicated by every arch that uses it. Signed-off-by: Bjorn Helgaas Signed-off-by: Bartlomiej Zolnierkiewicz --- include/asm-alpha/ide.h | 4 ---- include/asm-sh/ide.h | 4 ---- include/asm-sh64/ide.h | 4 ---- include/linux/ide.h | 4 ++++ 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h index 68934a2593..6126afe273 100644 --- a/include/asm-alpha/ide.h +++ b/include/asm-alpha/ide.h @@ -15,10 +15,6 @@ #include -#ifndef MAX_HWIFS -#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS -#endif - #define IDE_ARCH_OBSOLETE_DEFAULTS static inline int ide_default_irq(unsigned long base) diff --git a/include/asm-sh/ide.h b/include/asm-sh/ide.h index f42cf3977a..711dad4cb4 100644 --- a/include/asm-sh/ide.h +++ b/include/asm-sh/ide.h @@ -16,10 +16,6 @@ #include -#ifndef MAX_HWIFS -#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS -#endif - #define ide_default_io_ctl(base) (0) #include diff --git a/include/asm-sh64/ide.h b/include/asm-sh64/ide.h index 6fd514daa1..852f50afe3 100644 --- a/include/asm-sh64/ide.h +++ b/include/asm-sh64/ide.h @@ -17,10 +17,6 @@ #include -#ifndef MAX_HWIFS -#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS -#endif - /* Without this, the initialisation of PCI IDE cards end up calling * ide_init_hwif_ports, which won't work. */ #ifdef CONFIG_BLK_DEV_IDEPCI diff --git a/include/linux/ide.h b/include/linux/ide.h index e0cf4811da..77ae55d4c1 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -267,6 +267,10 @@ static inline void ide_std_init_ports(hw_regs_t *hw, #include +#ifndef MAX_HWIFS +#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS +#endif + /* needed on alpha, x86/x86_64, ia64, mips, ppc32 and sh */ #ifndef IDE_ARCH_OBSOLETE_DEFAULTS # define ide_default_io_base(index) (0) -- 2.39.5