Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

[powerpc.git] / include / asm-m68k / ide.h

diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h
index 896683a..f9ffb2c 100644 (file)
--- a/include/asm-m68k/ide.h
+++ b/include/asm-m68k/ide.h
@@ -123,7 +123,7 @@ static __inline__ void ide_release_lock (void)
 }
 
 static __inline__ void
-ide_get_lock(irqreturn_t (*handler)(int, void *), void *data)
+ide_get_lock(irq_handler_t handler, void *data)
 {
        if (MACH_IS_ATARI) {
                if (falconide_intr_lock == 0) {