diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /drivers/sound/ac97_codec.h | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'drivers/sound/ac97_codec.h')
| -rw-r--r-- | drivers/sound/ac97_codec.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/sound/ac97_codec.h b/drivers/sound/ac97_codec.h index 27d41f5bb..a614edbdb 100644 --- a/drivers/sound/ac97_codec.h +++ b/drivers/sound/ac97_codec.h @@ -107,16 +107,17 @@ /* OSS interface to the ac97s.. */ #define AC97_STEREO_MASK (SOUND_MASK_VOLUME|SOUND_MASK_PCM|\ SOUND_MASK_LINE|SOUND_MASK_CD|\ - SOUND_MIXER_ALTPCM|SOUND_MASK_IGAIN|\ + SOUND_MASK_ALTPCM|SOUND_MASK_IGAIN|\ SOUND_MASK_LINE1|SOUND_MASK_VIDEO) #define AC97_SUPPORTED_MASK (AC97_STEREO_MASK | \ SOUND_MASK_BASS|SOUND_MASK_TREBLE|\ SOUND_MASK_SPEAKER|SOUND_MASK_MIC|\ - SOUND_MIXER_PHONEIN|SOUND_MIXER_PHONEOUT) + SOUND_MASK_PHONEIN|SOUND_MASK_PHONEOUT) #define AC97_RECORD_MASK (SOUND_MASK_MIC|\ - SOUND_MASK_CD| SOUND_MASK_VIDEO| SOUND_MASK_LINE1| SOUND_MASK_LINE|\ + SOUND_MASK_CD|SOUND_MASK_VIDEO|\ + SOUND_MASK_LINE1| SOUND_MASK_LINE|\ SOUND_MASK_PHONEIN) #define supported_mixer(CODEC,FOO) ( CODEC->supported_mixers & (1<<FOO) ) @@ -153,6 +154,8 @@ struct ac97_codec { unsigned int mixer_state[SOUND_MIXER_NRDEVICES]; }; +extern int ac97_read_proc (char *page_out, char **start, off_t off, + int count, int *eof, void *data); extern int ac97_probe_codec(struct ac97_codec *); #endif /* _AC97_CODEC_H_ */ |