git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
include
/
sound
/
gus.h
diff --git
a/include/sound/gus.h
b/include/sound/gus.h
index
68a664a
..
63da50f
100644
(file)
--- a/
include/sound/gus.h
+++ b/
include/sound/gus.h
@@
-209,7
+209,7
@@
struct snd_gf1_mem {
struct snd_gf1_bank_info banks_16[4];
struct snd_gf1_mem_block *first;
struct snd_gf1_mem_block *last;
struct snd_gf1_bank_info banks_16[4];
struct snd_gf1_mem_block *first;
struct snd_gf1_mem_block *last;
- struct
mutex
memory_mutex;
+ struct
semaphore
memory_mutex;
};
struct snd_gf1_dma_block {
};
struct snd_gf1_dma_block {
@@
-467,8
+467,8
@@
struct snd_gus_card {
spinlock_t dma_lock;
spinlock_t pcm_volume_level_lock;
spinlock_t uart_cmd_lock;
spinlock_t dma_lock;
spinlock_t pcm_volume_level_lock;
spinlock_t uart_cmd_lock;
- struct
mutex
dma_mutex;
- struct
mutex
register_mutex;
+ struct
semaphore
dma_mutex;
+ struct
semaphore
register_mutex;
};
/* I/O functions for GF1/InterWave chip - gus_io.c */
};
/* I/O functions for GF1/InterWave chip - gus_io.c */