diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:56:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:56:19 -0700 |
commit | 98a1e95f9b5919b55c71a01546415074282d30d5 (patch) | |
tree | 7e539231ae9cf64614b6b9b358804ff8fdf056be /include | |
parent | abe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d (diff) | |
parent | 896c6fa1e59dd17e1ac2877c25cab19bbb24e666 (diff) | |
download | op-kernel-dev-98a1e95f9b5919b55c71a01546415074282d30d5.zip op-kernel-dev-98a1e95f9b5919b55c71a01546415074282d30d5.tar.gz |
Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[ISDN] minor irq handler cleanups
drivers/char: minor irq handler cleanups
[PPC] minor irq handler cleanups
[BLACKFIN] minor irq handler cleanups
[SPARC] minor irq handler cleanups
ARM minor irq handler cleanup: avoid passing unused info to irq
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-sparc/floppy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/floppy.h b/include/asm-sparc/floppy.h index dbe7a58..d3978e0 100644 --- a/include/asm-sparc/floppy.h +++ b/include/asm-sparc/floppy.h @@ -280,7 +280,7 @@ static inline void sun_fd_enable_dma(void) /* Our low-level entry point in arch/sparc/kernel/entry.S */ extern int sparc_floppy_request_irq(int irq, unsigned long flags, - irqreturn_t (*irq_handler)(int irq, void *)); + irq_handler_t irq_handler); static int sun_fd_request_irq(void) { |