diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /sound/drivers/mtpav.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/drivers/mtpav.c')
| -rw-r--r-- | sound/drivers/mtpav.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c index e064d6c5685b..a9ff391258e7 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c | |||
| @@ -570,7 +570,7 @@ static void snd_mtpav_read_bytes(struct mtpav *mcrd) | |||
| 570 | } while (sbyt & SIGS_BYTE); | 570 | } while (sbyt & SIGS_BYTE); |
| 571 | } | 571 | } |
| 572 | 572 | ||
| 573 | static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id, struct pt_regs *regs) | 573 | static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id) |
| 574 | { | 574 | { |
| 575 | struct mtpav *mcard = dev_id; | 575 | struct mtpav *mcard = dev_id; |
| 576 | 576 | ||