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/isa/opti9xx/opti92x-ad1848.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/isa/opti9xx/opti92x-ad1848.c')
| -rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 9d528ae00bff..a1ad39a8cdce 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
| @@ -1090,7 +1090,7 @@ static void snd_opti93x_overrange(struct snd_opti93x *chip) | |||
| 1090 | spin_unlock_irqrestore(&chip->lock, flags); | 1090 | spin_unlock_irqrestore(&chip->lock, flags); |
| 1091 | } | 1091 | } |
| 1092 | 1092 | ||
| 1093 | static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1093 | static irqreturn_t snd_opti93x_interrupt(int irq, void *dev_id) |
| 1094 | { | 1094 | { |
| 1095 | struct snd_opti93x *codec = dev_id; | 1095 | struct snd_opti93x *codec = dev_id; |
| 1096 | unsigned char status; | 1096 | unsigned char status; |