diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
| commit | db5935001a43528e673ad26ffec9d98c60a496a9 (patch) | |
| tree | 8e735327a97beccabb5d94ef93df25d2bacda705 /sound/oss/dmasound/dmasound.h | |
| parent | 34f3a814eef8069a24e5b3ebcf27aba9dabac2ea (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into sched/core
Diffstat (limited to 'sound/oss/dmasound/dmasound.h')
| -rw-r--r-- | sound/oss/dmasound/dmasound.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/dmasound/dmasound.h b/sound/oss/dmasound/dmasound.h index 1cb13fe56ec4..1308d8d34186 100644 --- a/sound/oss/dmasound/dmasound.h +++ b/sound/oss/dmasound/dmasound.h | |||
| @@ -235,7 +235,7 @@ struct sound_queue { | |||
| 235 | */ | 235 | */ |
| 236 | int active; | 236 | int active; |
| 237 | wait_queue_head_t action_queue, open_queue, sync_queue; | 237 | wait_queue_head_t action_queue, open_queue, sync_queue; |
| 238 | fmode_t open_mode; | 238 | int non_blocking; |
| 239 | int busy, syncing, xruns, died; | 239 | int busy, syncing, xruns, died; |
| 240 | }; | 240 | }; |
| 241 | 241 | ||