diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 13:42:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-01 13:42:26 -0400 |
| commit | 9a51cf28a3377689edfe190b9590da7d46e8f3fb (patch) | |
| tree | d17c9e58ae5eb993811174bfa7a8d45002145047 /include/sound | |
| parent | a0e881b7c189fa2bd76c024dbff91e79511c971d (diff) | |
| parent | aff252a848ce21b431ba822de3dab9c4c94571cb (diff) | |
Merge tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"A collection of small fixes that have been found recently. Most of
the commits are regression fixes in HD-audio and some other random
drivers."
* tag 'sound-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: snd-usb: fix clock source validity index
ALSA: hda - Fix mute-LED GPIO initialization for IDT codecs
ALSA: hda - Add descriptions for missing IDT 92HD83x models
ALSA: hda - Fix polarity of mute LED on HP Mini 210
ALSA: es1688 - freeup resources on init failure
ALSA: hda - Workaround for silent output on VAIO Z with ALC889
ALSA: hda - Fix WARNING from HDMI/DP parser
ALSA: hda - Detach from converter at closing in patch_hdmi.c
ALSA: hda - Fix mute-LED GPIO setup for HP Mini 210
ALSA: mpu401: Fix missing initialization of irq field
ALSA: hda - Fix invalid D3 of headphone DAC on VT202x codecs
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/es1688.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/es1688.h b/include/sound/es1688.h index 3ec7ecbe2502..f752dd33dfaf 100644 --- a/include/sound/es1688.h +++ b/include/sound/es1688.h | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #define ES1688_HW_AUTO 0x0000 | 29 | #define ES1688_HW_AUTO 0x0000 |
| 30 | #define ES1688_HW_688 0x0001 | 30 | #define ES1688_HW_688 0x0001 |
| 31 | #define ES1688_HW_1688 0x0002 | 31 | #define ES1688_HW_1688 0x0002 |
| 32 | #define ES1688_HW_UNDEF 0x0003 | ||
| 32 | 33 | ||
| 33 | struct snd_es1688 { | 34 | struct snd_es1688 { |
| 34 | unsigned long port; /* port of ESS chip */ | 35 | unsigned long port; /* port of ESS chip */ |