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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
sound
/
gus.h
diff --git
a/include/sound/gus.h
b/include/sound/gus.h
index
63da50f
..
c49ea57
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
semaphore
memory_mutex;
+ struct
mutex
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
semaphore
dma_mutex;
- struct
semaphore
register_mutex;
+ struct
mutex
dma_mutex;
+ struct
mutex
register_mutex;
};
/* I/O functions for GF1/InterWave chip - gus_io.c */
};
/* I/O functions for GF1/InterWave chip - gus_io.c */
@@
-638,7
+638,7
@@
int snd_gus_initialize(struct snd_gus_card * gus);
/* gus_irq.c */
/* gus_irq.c */
-irqreturn_t snd_gus_interrupt(int irq, void *dev_id
, struct pt_regs *regs
);
+irqreturn_t snd_gus_interrupt(int irq, void *dev_id);
#ifdef CONFIG_SND_DEBUG
void snd_gus_irq_profile_init(struct snd_gus_card *gus);
#endif
#ifdef CONFIG_SND_DEBUG
void snd_gus_irq_profile_init(struct snd_gus_card *gus);
#endif