diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-19 02:22:57 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-19 02:22:57 -0500 |
| commit | 0ff555192a8d20385d49d1c420e2e8d409b3c0da (patch) | |
| tree | b6e4b6cae1028a310a3488ebf745954c51694bfc /sound/oss/msnd.h | |
| parent | 3218c178b41b420cb7e0d120c7a137a3969242e5 (diff) | |
| parent | 9e43f0de690211cf7153b5f3ec251bc315647ada (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/oss/msnd.h')
| -rw-r--r-- | sound/oss/msnd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/msnd.h b/sound/oss/msnd.h index 61b3955481c5..c8be47ec2b7e 100644 --- a/sound/oss/msnd.h +++ b/sound/oss/msnd.h | |||
| @@ -211,7 +211,7 @@ typedef struct multisound_dev { | |||
| 211 | 211 | ||
| 212 | /* State variables */ | 212 | /* State variables */ |
| 213 | enum { msndClassic, msndPinnacle } type; | 213 | enum { msndClassic, msndPinnacle } type; |
| 214 | mode_t mode; | 214 | fmode_t mode; |
| 215 | unsigned long flags; | 215 | unsigned long flags; |
| 216 | #define F_RESETTING 0 | 216 | #define F_RESETTING 0 |
| 217 | #define F_HAVEDIGITAL 1 | 217 | #define F_HAVEDIGITAL 1 |