diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
| commit | 3e414096429d55fbc8116171bba3487647bbe638 (patch) | |
| tree | 2b5fcfd9d16fa3a32c829fc2076f6e3785b43374 /include/asm-arm/arch-cl7500 | |
| parent | 20b23bfcf36fcb2d16d8b844501072541970637c (diff) | |
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'include/asm-arm/arch-cl7500')
| -rw-r--r-- | include/asm-arm/arch-cl7500/ide.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-arm/arch-cl7500/ide.h b/include/asm-arm/arch-cl7500/ide.h index 590579747..53daa0969 100644 --- a/include/asm-arm/arch-cl7500/ide.h +++ b/include/asm-arm/arch-cl7500/ide.h @@ -13,7 +13,7 @@ * This should follow whatever the default interface uses. */ static __inline__ void -ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int irq) +ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int *irq) { ide_ioreg_t reg = (ide_ioreg_t) data_port; int i; @@ -25,7 +25,8 @@ ide_init_hwif_ports(hw_regs_t *hw, int data_port, int ctrl_port, int irq) reg += 1; } hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port; - hw->irq = irq; + if (irq) + *irq = 0; } /* |