commit 70d13e083c8589dd3edc2313777655da39cb3568
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sat Dec 06 08:25:16 2008 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat Dec 13 09:12:07 2008 +0000
tree 41478a4699b3cbc8c5598ccc1863ea058948741e
parent 7ec80ddf0455ff3854a5ca524952d91b5eb676b2

[ARM] netwinder: clean up GPIO naming

Netwinder was using gpio_xxx names which could clash with the GPIO
layer.  Add a 'nw_' prefix to ensure that these remain separate.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

sound/oss/waveartist.c

diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index c47842f..2c63bb9 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -1483,16 +1483,14 @@
 #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