diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:39:47 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 23:39:47 +0100 |
| commit | 55fa518867978e1f5fd8353098f80d125ac734d7 (patch) | |
| tree | 3502b331c1f9ec4cac25dc8ba30b6a0a324e350c /sound/oss/dmasound/dmasound.h | |
| parent | bb1f24bf00a85f666b56a09b7cdbfd221af16c2c (diff) | |
| parent | eea0579fc85e64e9f05361d5aacf496fe7a151aa (diff) | |
Merge branch 'topic/pcsp-fix' into topic/misc
Diffstat (limited to 'sound/oss/dmasound/dmasound.h')
| -rw-r--r-- | sound/oss/dmasound/dmasound.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/dmasound/dmasound.h b/sound/oss/dmasound/dmasound.h index d978b009656..1308d8d3418 100644 --- a/sound/oss/dmasound/dmasound.h +++ b/sound/oss/dmasound/dmasound.h @@ -129,7 +129,7 @@ typedef struct { int (*mixer_ioctl)(u_int, u_long); /* optional */ int (*write_sq_setup)(void); /* optional */ int (*read_sq_setup)(void); /* optional */ - int (*sq_open)(mode_t); /* optional */ + int (*sq_open)(fmode_t); /* optional */ int (*state_info)(char *, size_t); /* optional */ void (*abort_read)(void); /* optional */ int min_dsp_speed; @@ -235,7 +235,7 @@ struct sound_queue { */ int active; wait_queue_head_t action_queue, open_queue, sync_queue; - int open_mode; + int non_blocking; int busy, syncing, xruns, died; }; |