patch-2.4.0-test3 linux/include/asm-arm/arch-shark/ide.h

• Lines: 29
• Date: Mon Jun 26 12:04:42 2000
• Orig file: v2.4.0-test2/linux/include/asm-arm/arch-shark/ide.h
• Orig date: Tue Apr 11 15:09:23 2000

diff -u --recursive --new-file v2.4.0-test2/linux/include/asm-arm/arch-shark/ide.h linux/include/asm-arm/arch-shark/ide.h
@@ -15,7 +15,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;
@@ -27,7 +27,8 @@
 		reg += 1;
 	}
 	hw->io_ports[IDE_CONTROL_OFFSET] = (ide_ioreg_t) ctrl_port;
-	hw->irq = irq;
+	if (irq)
+		*irq = 0;
 }
 
 /*
@@ -39,7 +40,8 @@
 {
 	hw_regs_t hw;
 
-	ide_init_hwif_ports(&hw, 0x1f0, 0x3f6, 14);
+	ide_init_hwif_ports(&hw, 0x1f0, 0x3f6, NULL);
+	hw.irq = 14;
 	ide_register_hw(&hw, NULL);
 }