diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 09:14:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 09:14:24 -0700 |
commit | 45fc3c4d9b7ab12798af43a73aea53eeecd16acf (patch) | |
tree | 70281ada76ebc49572505baea6e442b265ceb5e4 /sound/soc/pxa | |
parent | 96348852cf8ff5597a39e866838679b3a9a38947 (diff) | |
parent | 9e6dd47bf365f8f7bccea10f22fbbdbecce429e8 (diff) | |
download | lwn-45fc3c4d9b7ab12798af43a73aea53eeecd16acf.tar.gz lwn-45fc3c4d9b7ab12798af43a73aea53eeecd16acf.zip |
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 - support new AMD HDMI Audio (1002:970f)
ALSA: hda_intel: ALSA HD Audio patch for Intel Ibex Peak DeviceIDs
ALSA: wm8750: add missing VREF output
ALSA: spitz: MONO -> MONO1
ALSA: wm8750: it's MONO1, not MONO
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r-- | sound/soc/pxa/spitz.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index eefc25b83514..37cb768fc933 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c @@ -297,7 +297,7 @@ static int spitz_wm8750_init(struct snd_soc_codec *codec) snd_soc_dapm_disable_pin(codec, "LINPUT3"); snd_soc_dapm_disable_pin(codec, "RINPUT3"); snd_soc_dapm_disable_pin(codec, "OUT3"); - snd_soc_dapm_disable_pin(codec, "MONO"); + snd_soc_dapm_disable_pin(codec, "MONO1"); /* Add spitz specific controls */ for (i = 0; i < ARRAY_SIZE(wm8750_spitz_controls); i++) { |