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/isa/sb/es968.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/isa/sb/es968.c')
| -rw-r--r-- | sound/isa/sb/es968.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/isa/sb/es968.c b/sound/isa/sb/es968.c index d4d65b84265a..d4b218726ce7 100644 --- a/sound/isa/sb/es968.c +++ b/sound/isa/sb/es968.c | |||
| @@ -70,8 +70,7 @@ MODULE_DEVICE_TABLE(pnp_card, snd_es968_pnpids); | |||
| 70 | 70 | ||
| 71 | #define DRIVER_NAME "snd-card-es968" | 71 | #define DRIVER_NAME "snd-card-es968" |
| 72 | 72 | ||
| 73 | static irqreturn_t snd_card_es968_interrupt(int irq, void *dev_id, | 73 | static irqreturn_t snd_card_es968_interrupt(int irq, void *dev_id) |
| 74 | struct pt_regs *regs) | ||
| 75 | { | 74 | { |
| 76 | struct snd_sb *chip = dev_id; | 75 | struct snd_sb *chip = dev_id; |
| 77 | 76 | ||