summaryrefslogtreecommitdiffstats
path: root/drivers/char/vr41xx_giu.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 01:32:01 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 01:32:01 +0200
commit44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch)
tree93824f573767da634fbc82c388b6d33cc454212b /drivers/char/vr41xx_giu.c
parent[PATCH] UDF: Fix mounting read-write (diff)
parentIRQ: Maintain regs pointer globally rather than passing to IRQ handlers (diff)
downloadlinux-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.tar.xz
linux-44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3.zip
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/vr41xx_giu.c')
-rw-r--r--drivers/char/vr41xx_giu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
index 8116a47b80f4..8e7949305171 100644
--- a/drivers/char/vr41xx_giu.c
+++ b/drivers/char/vr41xx_giu.c
@@ -221,7 +221,7 @@ static struct hw_interrupt_type giuint_high_irq_type = {
.end = end_giuint_high_irq,
};
-static int giu_get_irq(unsigned int irq, struct pt_regs *regs)
+static int giu_get_irq(unsigned int irq)
{
uint16_t pendl, pendh, maskl, maskh;
int i;