diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 17:29:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-09 17:29:26 -0400 |
| commit | 9b6d99f48dfc27d6009e134a5d771eaefd75faac (patch) | |
| tree | 5131841a5df84ad9564dad19f11f9d1a0e0085bb /arch/ia64 | |
| parent | 5a43c09d1b65da614620b1985633e3251b4f9b99 (diff) | |
| parent | 40220c1a192f51695f806d75b1f9970f0f17a6e8 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Use the new typedef for interrupt handler function pointers
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/hp/sim/simserial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c index 77819acaea9d..5095778be53c 100644 --- a/arch/ia64/hp/sim/simserial.c +++ b/arch/ia64/hp/sim/simserial.c | |||
| @@ -714,7 +714,7 @@ startup(struct async_struct *info) | |||
| 714 | { | 714 | { |
| 715 | unsigned long flags; | 715 | unsigned long flags; |
| 716 | int retval=0; | 716 | int retval=0; |
| 717 | irqreturn_t (*handler)(int, void *); | 717 | irq_handler_t handler; |
| 718 | struct serial_state *state= info->state; | 718 | struct serial_state *state= info->state; |
| 719 | unsigned long page; | 719 | unsigned long page; |
| 720 | 720 | ||