aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound/mixer_oss.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-22 19:13:54 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-22 19:13:54 -0500
commitf01c18456993bab43067b678f56c87ca954aa43b (patch)
tree3e0cd0cdf1a57618202b46a7126125902e3ab832 /include/sound/mixer_oss.h
parent949ec2c8e6b7b89179b85baf6309c009e1a1b951 (diff)
parent1c2e02750b992703a8a18634e08b04353face243 (diff)
downloadkernel_samsung_smdk4412-f01c18456993bab43067b678f56c87ca954aa43b.tar.gz
kernel_samsung_smdk4412-f01c18456993bab43067b678f56c87ca954aa43b.tar.bz2
kernel_samsung_smdk4412-f01c18456993bab43067b678f56c87ca954aa43b.zip
Merge branch 'master'
Diffstat (limited to 'include/sound/mixer_oss.h')
-rw-r--r--include/sound/mixer_oss.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/mixer_oss.h b/include/sound/mixer_oss.h
index ca5b4822b62..197b9e3d612 100644
--- a/include/sound/mixer_oss.h
+++ b/include/sound/mixer_oss.h
@@ -61,7 +61,7 @@ struct snd_mixer_oss {
unsigned int active_index);
void *private_data_recsrc;
void (*private_free_recsrc)(struct snd_mixer_oss *mixer);
- struct semaphore reg_mutex;
+ struct mutex reg_mutex;
struct snd_info_entry *proc_entry;
int oss_dev_alloc;
/* --- */