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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
oss
/
ymfpci.h
diff --git
a/sound/oss/ymfpci.h
b/sound/oss/ymfpci.h
index
87a24f0
..
ac1785f
100644
(file)
--- a/
sound/oss/ymfpci.h
+++ b/
sound/oss/ymfpci.h
@@
-22,6
+22,7
@@
*
*/
#include <linux/config.h>
*
*/
#include <linux/config.h>
+#include <linux/mutex.h>
/*
* Direct registers
/*
* Direct registers
@@
-239,7
+240,7
@@
struct ymf_capture {
struct ymf_unit {
u8 rev; /* PCI revision */
struct ymf_unit {
u8 rev; /* PCI revision */
- void *reg_area_virt;
+ void
__iomem
*reg_area_virt;
void *dma_area_va;
dma_addr_t dma_area_ba;
unsigned int dma_area_size;
void *dma_area_va;
dma_addr_t dma_area_ba;
unsigned int dma_area_size;
@@
-279,7
+280,7
@@
struct ymf_unit {
/* soundcore stuff */
int dev_audio;
/* soundcore stuff */
int dev_audio;
- struct
semaphore open_sem
;
+ struct
mutex open_mutex
;
struct list_head ymf_devs;
struct list_head states; /* List of states for this unit */
struct list_head ymf_devs;
struct list_head states; /* List of states for this unit */