Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[~andy/linux] / sound / oss / waveartist.c

diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index b48c72923a13dfb30c35669213112a31baa4ffc2..88490418f9325fea8424e00e1ff54ee811e87230 100644 (file)
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -835,7 +835,7 @@ static struct audio_driver waveartist_audio_driver = {
 static irqreturn_t
 waveartist_intr(int irq, void *dev_id)
 {
-       wavnc_info *devc = (wavnc_info *)dev_id;
+       wavnc_info *devc = dev_id;
        int        irqstatus, status;
 
        spin_lock(&waveartist_lock);