diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/char/mbcs.c | |
parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/char/mbcs.c')
-rw-r--r-- | drivers/char/mbcs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c index 636354722658..0afb7ba999cf 100644 --- a/drivers/char/mbcs.c +++ b/drivers/char/mbcs.c | |||
@@ -516,11 +516,10 @@ int mbcs_gscr_mmap(struct file *fp, struct vm_area_struct *vma) | |||
516 | * mbcs_completion_intr_handler - Primary completion handler. | 516 | * mbcs_completion_intr_handler - Primary completion handler. |
517 | * @irq: irq | 517 | * @irq: irq |
518 | * @arg: soft struct for device | 518 | * @arg: soft struct for device |
519 | * @ep: regs | ||
520 | * | 519 | * |
521 | */ | 520 | */ |
522 | static irqreturn_t | 521 | static irqreturn_t |
523 | mbcs_completion_intr_handler(int irq, void *arg, struct pt_regs *ep) | 522 | mbcs_completion_intr_handler(int irq, void *arg) |
524 | { | 523 | { |
525 | struct mbcs_soft *soft = (struct mbcs_soft *)arg; | 524 | struct mbcs_soft *soft = (struct mbcs_soft *)arg; |
526 | void *mmr_base; | 525 | void *mmr_base; |