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/oss/hal2.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/oss/hal2.c')
| -rw-r--r-- | sound/oss/hal2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/hal2.c b/sound/oss/hal2.c index 80ab402dae9a..784bdd707055 100644 --- a/sound/oss/hal2.c +++ b/sound/oss/hal2.c | |||
| @@ -370,9 +370,9 @@ static void hal2_adc_interrupt(struct hal2_codec *adc) | |||
| 370 | wake_up(&adc->dma_wait); | 370 | wake_up(&adc->dma_wait); |
| 371 | } | 371 | } |
| 372 | 372 | ||
| 373 | static irqreturn_t hal2_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 373 | static irqreturn_t hal2_interrupt(int irq, void *dev_id) |
| 374 | { | 374 | { |
| 375 | struct hal2_card *hal2 = (struct hal2_card*)dev_id; | 375 | struct hal2_card *hal2 = dev_id; |
| 376 | irqreturn_t ret = IRQ_NONE; | 376 | irqreturn_t ret = IRQ_NONE; |
| 377 | 377 | ||
| 378 | /* decide what caused this interrupt */ | 378 | /* decide what caused this interrupt */ |