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 /sound/pci/ali5451/ali5451.c | |
parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/pci/ali5451/ali5451.c')
-rw-r--r-- | sound/pci/ali5451/ali5451.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index 74668398eac..13a8cefa774 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c @@ -1047,9 +1047,7 @@ static void snd_ali_interrupt(struct snd_ali * codec) } -static irqreturn_t snd_ali_card_interrupt(int irq, - void *dev_id, - struct pt_regs *regs) +static irqreturn_t snd_ali_card_interrupt(int irq, void *dev_id) { struct snd_ali *codec = dev_id; |