Merge tag 'r8169-upstream-20061204-00' of git://electric-eye.fr.zoreil.com/home/romie...

[mv-sheeva.git] / sound / oss / hal2.c

diff --git a/sound/oss/hal2.c b/sound/oss/hal2.c
index 80ab402dae9a5123760dcd9acfa019467656a2ff..784bdd707055ede1e4ae3cdf176fd3ba262e26d1 100644 (file)
--- a/sound/oss/hal2.c
+++ b/sound/oss/hal2.c
@@ -370,9 +370,9 @@ static void hal2_adc_interrupt(struct hal2_codec *adc)
        wake_up(&adc->dma_wait);
 }
 
-static irqreturn_t hal2_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t hal2_interrupt(int irq, void *dev_id)
 {
-       struct hal2_card *hal2 = (struct hal2_card*)dev_id;
+       struct hal2_card *hal2 = dev_id;
        irqreturn_t ret = IRQ_NONE;
 
        /* decide what caused this interrupt */