projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[firefly-linux-kernel-4.4.55.git]
/
include
/
sound
/
mixer_oss.h
diff --git
a/include/sound/mixer_oss.h
b/include/sound/mixer_oss.h
index ca5b4822b62c8e0cb79b7d1c14ad58e313bd32d6..197b9e3d612b96d54bcb6912d2dd3d9dffdb302d 100644
(file)
--- 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);
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;
/* --- */
struct snd_info_entry *proc_entry;
int oss_dev_alloc;
/* --- */