projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'acpica', 'aml-custom', 'bugzilla-16548', 'bugzilla-20242', 'd3-cold...
[cascardo/linux.git]
/
sound
/
oss
/
dmasound
/
dmasound.h
diff --git
a/sound/oss/dmasound/dmasound.h
b/sound/oss/dmasound/dmasound.h
index
1cb13fe
..
1308d8d
100644
(file)
--- a/
sound/oss/dmasound/dmasound.h
+++ b/
sound/oss/dmasound/dmasound.h
@@
-235,7
+235,7
@@
struct sound_queue {
*/
int active;
wait_queue_head_t action_queue, open_queue, sync_queue;
-
fmode_t open_mode
;
+
int non_blocking
;
int busy, syncing, xruns, died;
};