aboutsummaryrefslogtreecommitdiff
path: root/sound/oss/waveartist.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss/waveartist.c')
-rw-r--r--sound/oss/waveartist.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index 52468742d9f..672af8b5654 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -42,7 +42,6 @@
#include <linux/spinlock.h>
#include <linux/bitops.h>
-#include <asm/system.h>
#include "sound_config.h"
#include "waveartist.h"
@@ -1483,9 +1482,9 @@ vnc_mute_spkr(wavnc_info *devc)
{
unsigned long flags;
- spin_lock_irqsave(&nw_gpio_lock, flags);
+ raw_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);
+ raw_spin_unlock_irqrestore(&nw_gpio_lock, flags);
}
static void