diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-04 09:43:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-04 09:43:58 -0700 |
| commit | d389c7d8988aecfdc06d9e9f9769af09e6592082 (patch) | |
| tree | 59adb78aa4acba0664905d5b5ef63cc11778703d /include | |
| parent | 4ded383569d6316d68d2aed298f8eb8d7bca37af (diff) | |
| parent | 378bd6a5211f05d6d8eb3e78a92e2a197e456e4e (diff) | |
| download | linux-d389c7d8988aecfdc06d9e9f9769af09e6592082.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] hda - COMPAL IFL90/JFL-92 laptop quirk
[ALSA] hda - Fix resume of auto-config mode with Realtek codecs
[ALSA] hda - Fix model for LG LS75 laptop
[ALSA] hda - Fix mic input on HP2133
[ALSA] ac97 - Fix ASUS A9T laptop output
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/ac97_codec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index 049edc5e6461..9c309daf492b 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -505,6 +505,7 @@ struct snd_ac97 { unsigned short pcmreg[3]; // PCM registers unsigned short codec_cfg[3]; // CODEC_CFG bits unsigned char swap_mic_linein; // AD1986/AD1986A only + unsigned char lo_as_master; /* LO as master */ } ad18xx; unsigned int dev_flags; /* device specific */ } spec; |