diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 13:13:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 13:13:38 -0400 |
| commit | fc8a327db6c46de783b1a4276d846841b9abc24c (patch) | |
| tree | bee512c142cccea93511debd98ef954581693727 /include/sound/ac97_codec.h | |
| parent | 92d15c2ccbb3e31a3fc71ad28fdb55e1319383c0 (diff) | |
| parent | 24837e6f249a2c83667552e6871c1543b4a6b934 (diff) | |
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (264 commits)
[ALSA] version 1.0.15
[ALSA] Fix thinko in cs4231 mce down check
[ALSA] sun-cs4231: improved waiting after MCE down
[ALSA] sun-cs4231: use cs4231-regs.h
[ALSA] This simplifies and fixes waiting loops of the mce_down()
[ALSA] This patch adds support for a wavetable chip on
[ALSA] This patch removes open_mutex from the ad1848-lib as
[ALSA] fix bootup crash in snd_gus_interrupt()
[ALSA] hda-codec - Fix SKU ID function for realtek codecs
[ALSA] Support ASUS P701 eeepc [0x1043 0x82a1] support
[ALSA] hda-codec - Add array terminator for dmic in STAC codec
[ALSA] hdsp - Fix zero division
[ALSA] usb-audio - Fix double comment
[ALSA] hda-codec - Fix STAC922x volume knob control
[ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz
[ALSA] hda-codec - Fix for Fujitsu Lifebook C1410
[ALSA] mpu-401: remove MPU401_INFO_UART_ONLY flag
[ALSA] mpu-401: do not require an ACK byte for the ENTER_UART command
[ALSA] via82xx - Add DXS quirk for Shuttle AK31v2
[ALSA] hda-codec - Fix input_mux numbers for vaio stac92xx
...
Diffstat (limited to 'include/sound/ac97_codec.h')
| -rw-r--r-- | include/sound/ac97_codec.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 246ac23534bd..01480581f825 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | #define __SOUND_AC97_CODEC_H | 2 | #define __SOUND_AC97_CODEC_H |
| 3 | 3 | ||
| 4 | /* | 4 | /* |
| 5 | * Copyright (c) by Jaroslav Kysela <perex@suse.cz> | 5 | * Copyright (c) by Jaroslav Kysela <perex@perex.cz> |
| 6 | * Universal interface for Audio Codec '97 | 6 | * Universal interface for Audio Codec '97 |
| 7 | * | 7 | * |
| 8 | * For more details look to AC '97 component specification revision 2.1 | 8 | * For more details look to AC '97 component specification revision 2.1 |
| @@ -345,9 +345,9 @@ | |||
| 345 | #define AC97_ALC650_GPIO_STATUS 0x78 | 345 | #define AC97_ALC650_GPIO_STATUS 0x78 |
| 346 | #define AC97_ALC650_CLOCK 0x7a | 346 | #define AC97_ALC650_CLOCK 0x7a |
| 347 | 347 | ||
| 348 | /* specific - Yamaha YMF753 */ | 348 | /* specific - Yamaha YMF7x3 */ |
| 349 | #define AC97_YMF753_DIT_CTRL2 0x66 /* DIT Control 2 */ | 349 | #define AC97_YMF7X3_DIT_CTRL 0x66 /* DIT Control (YMF743) / 2 (YMF753) */ |
| 350 | #define AC97_YMF753_3D_MODE_SEL 0x68 /* 3D Mode Select */ | 350 | #define AC97_YMF7X3_3D_MODE_SEL 0x68 /* 3D Mode Select */ |
| 351 | 351 | ||
| 352 | /* specific - C-Media */ | 352 | /* specific - C-Media */ |
| 353 | #define AC97_CM9738_VENDOR_CTRL 0x5a | 353 | #define AC97_CM9738_VENDOR_CTRL 0x5a |