git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master'
[pandora-kernel.git]
/
include
/
sound
/
cs46xx.h
diff --git
a/include/sound/cs46xx.h
b/include/sound/cs46xx.h
index
199b509
..
80b2979
100644
(file)
--- a/
include/sound/cs46xx.h
+++ b/
include/sound/cs46xx.h
@@
-1711,7
+1711,7
@@
struct snd_cs46xx {
int current_gpio;
#endif
#ifdef CONFIG_SND_CS46XX_NEW_DSP
- struct
semaphore
spos_mutex;
+ struct
mutex
spos_mutex;
struct dsp_spos_instance * dsp_spos_instance;