From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 2 Mar 2012 08:00:33 +0000 (+0100)
Subject: Merge branch 'fix/hda' into topic/hda
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c589750a70831b8cee3c10e01c297fefde104e3;p=mv-sheeva.git

Merge branch 'fix/hda' into topic/hda

Speaker-Out renames are merged.

Conflicts:
	sound/pci/hda/patch_realtek.c
---

7c589750a70831b8cee3c10e01c297fefde104e3
diff --cc sound/pci/hda/patch_realtek.c
index e142f6f5c49,f286bb8fda1..01179d53edc
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@@ -1854,10 -1847,36 +1854,10 @@@ DEFINE_CAPMIX_NOSRC(3)
  /*
   * slave controls for virtual master
   */
 -static const char * const alc_slave_vols[] = {
 -	"Front Playback Volume",
 -	"Surround Playback Volume",
 -	"Center Playback Volume",
 -	"LFE Playback Volume",
 -	"Side Playback Volume",
 -	"Headphone Playback Volume",
 -	"Speaker Playback Volume",
 -	"Mono Playback Volume",
 -	"Line Out Playback Volume",
 -	"CLFE Playback Volume",
 -	"Bass Speaker Playback Volume",
 -	"PCM Playback Volume",
 -	NULL,
 -};
 -
 -static const char * const alc_slave_sws[] = {
 -	"Front Playback Switch",
 -	"Surround Playback Switch",
 -	"Center Playback Switch",
 -	"LFE Playback Switch",
 -	"Side Playback Switch",
 -	"Headphone Playback Switch",
 -	"Speaker Playback Switch",
 -	"Mono Playback Switch",
 -	"IEC958 Playback Switch",
 -	"Line Out Playback Switch",
 -	"CLFE Playback Switch",
 -	"Bass Speaker Playback Switch",
 -	"PCM Playback Switch",
 +static const char * const alc_slave_pfxs[] = {
 +	"Front", "Surround", "Center", "LFE", "Side",
- 	"Headphone", "Speaker", "Mono", "Line-Out",
++	"Headphone", "Speaker", "Mono", "Line Out",
 +	"CLFE", "Bass Speaker", "PCM",
  	NULL,
  };