diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-06 08:25:16 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-13 09:12:07 +0000 |
| commit | 70d13e083c8589dd3edc2313777655da39cb3568 (patch) | |
| tree | 41478a4699b3cbc8c5598ccc1863ea058948741e /sound/oss | |
| parent | 7ec80ddf0455ff3854a5ca524952d91b5eb676b2 (diff) | |
| download | linux-3.10-70d13e083c8589dd3edc2313777655da39cb3568.tar.gz linux-3.10-70d13e083c8589dd3edc2313777655da39cb3568.tar.bz2 linux-3.10-70d13e083c8589dd3edc2313777655da39cb3568.zip | |
[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>
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/waveartist.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index c47842fad65..2c63bb9da74 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c @@ -1483,16 +1483,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 |