patch-2.1.30 linux/include/asm-m68k/ide.h

Next file: linux/include/asm-m68k/socket.h
Previous file: linux/include/asm-i386/termios.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.29/linux/include/asm-m68k/ide.h linux/include/asm-m68k/ide.h
@@ -362,7 +362,7 @@
 
 #endif /* CONFIG_ATARI */
 
-static __inline__ int ide_ack_intr (ide_ioreg_t base_port, ide_ioreg_t irq_port)
+static __inline__ int ide_ack_intr (ide_ioreg_t status_port, ide_ioreg_t irq_port)
 {
 #ifdef CONFIG_AMIGA
 	if (MACH_IS_AMIGA) {
@@ -371,7 +371,7 @@
 		if (!(ch & 0x80))
 			return(0);
 		if (AMIGAHW_PRESENT(A1200_IDE)) {
-			(void) inb(base_port);
+			(void) inb(status_port);
 			outb(0x7c | (ch & 0x03), irq_port);
 		}
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov