diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /include/asm-m68k/ide.h | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-m68k/ide.h')
| -rw-r--r-- | include/asm-m68k/ide.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h index 365f76fb8013..f9ffb2cbbae8 100644 --- a/include/asm-m68k/ide.h +++ b/include/asm-m68k/ide.h | |||
| @@ -123,7 +123,7 @@ static __inline__ void ide_release_lock (void) | |||
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | static __inline__ void | 125 | static __inline__ void |
| 126 | ide_get_lock(irqreturn_t (*handler)(int, void *, struct pt_regs *), void *data) | 126 | ide_get_lock(irq_handler_t handler, void *data) |
| 127 | { | 127 | { |
| 128 | if (MACH_IS_ATARI) { | 128 | if (MACH_IS_ATARI) { |
| 129 | if (falconide_intr_lock == 0) { | 129 | if (falconide_intr_lock == 0) { |