diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /include/asm-arm/arch-arc/ide.h | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'include/asm-arm/arch-arc/ide.h')
| -rw-r--r-- | include/asm-arm/arch-arc/ide.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-arm/arch-arc/ide.h b/include/asm-arm/arch-arc/ide.h index 8cc1baaa4..24bc4899d 100644 --- a/include/asm-arm/arch-arc/ide.h +++ b/include/asm-arm/arch-arc/ide.h @@ -11,13 +11,14 @@ */ #include <linux/config.h> +#include <asm/irq.h> static __inline__ int ide_default_irq(ide_ioreg_t base) { #ifdef CONFIG_ARCH_A5K if (base == 0x1f0) - return 11; + return IRQ_HARDDISK; #endif return 0; } @@ -52,5 +53,5 @@ ide_init_hwif_ports (ide_ioreg_t *p, ide_ioreg_t base, int stepping, int *irq) } *p++ = ctrl; if (irq != NULL) - irq = 0; + *irq = 0; } |