diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/char/vr41xx_giu.c | |
parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
download | kernel_samsung_smdk4412-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.zip kernel_samsung_smdk4412-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.tar.gz kernel_samsung_smdk4412-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.tar.bz2 |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/char/vr41xx_giu.c')
-rw-r--r-- | drivers/char/vr41xx_giu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c index 8116a47..8e79493 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; |