X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sound%2Foss%2Fwaveartist.c;h=e688dde6bbdeb0b54ae26c761eaba38b1ede5a95;hb=9aeead73782c4b8e2a91def36dbf95db28605c95;hp=c47842fad6575852a769bcb4ecf5f3c657d8455d;hpb=5aa37e4f0614e3b1f385426ce1e962e84c275bdf;p=~andy%2Flinux

diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index c47842fad65..e688dde6bbd 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -35,6 +35,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
@@ -1483,16 +1484,14 @@ static void __exit unload_waveartist(struct address_info *hw)
 #define VNC_HANDSET_DETECT	0x40
 #define VNC_DISABLE_AUTOSWITCH	0x80
 
-extern spinlock_t gpio_lock;
-
 static inline void
 vnc_mute_spkr(wavnc_info *devc)
 {
 	unsigned long flags;
 
-	spin_lock_irqsave(&gpio_lock, flags);
-	cpld_modify(CPLD_UNMUTE, devc->spkr_mute_state ? 0 : CPLD_UNMUTE);
-	spin_unlock_irqrestore(&gpio_lock, flags);
+	spin_lock_irqsave(&nw_gpio_lock, flags);
+	nw_cpld_modify(CPLD_UNMUTE, devc->spkr_mute_state ? 0 : CPLD_UNMUTE);
+	spin_unlock_irqrestore(&nw_gpio_lock, flags);
 }
 
 static void