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/drivers/mts64.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/drivers/mts64.c')
| -rw-r--r-- | sound/drivers/mts64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index ab8d4effcf9e..5327c6f841f4 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c | |||
| @@ -838,7 +838,7 @@ static int __devinit snd_mts64_rawmidi_create(struct snd_card *card) | |||
| 838 | /********************************************************************* | 838 | /********************************************************************* |
| 839 | * parport stuff | 839 | * parport stuff |
| 840 | *********************************************************************/ | 840 | *********************************************************************/ |
| 841 | static void snd_mts64_interrupt(int irq, void *private, struct pt_regs *r) | 841 | static void snd_mts64_interrupt(int irq, void *private) |
| 842 | { | 842 | { |
| 843 | struct mts64 *mts = ((struct snd_card*)private)->private_data; | 843 | struct mts64 *mts = ((struct snd_card*)private)->private_data; |
| 844 | u16 ret; | 844 | u16 ret; |