diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /include/asm-i386/ide.h | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'include/asm-i386/ide.h')
| -rw-r--r-- | include/asm-i386/ide.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h index 6876f9f60..1947b62c0 100644 --- a/include/asm-i386/ide.h +++ b/include/asm-i386/ide.h @@ -13,8 +13,10 @@ #ifdef __KERNEL__ +#include <linux/config.h> + #ifndef MAX_HWIFS -#define MAX_HWIFS 8 +#define MAX_HWIFS 10 #endif #define ide__sti() __sti() @@ -67,7 +69,7 @@ static __inline__ void ide_init_hwif_ports(hw_regs_t *hw, ide_ioreg_t data_port, static __inline__ void ide_init_default_hwifs(void) { -#ifdef __DO_I_NEED_THIS +#ifndef CONFIG_BLK_DEV_IDEPCI hw_regs_t hw; int index; @@ -76,7 +78,7 @@ static __inline__ void ide_init_default_hwifs(void) hw.irq = ide_default_irq(ide_default_io_base(index)); ide_register_hw(&hw, NULL); } -#endif /* __DO_I_NEED_THIS */ +#endif /* CONFIG_BLK_DEV_IDEPCI */ } typedef union { |