diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-11 16:46:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-11 16:46:36 +0200 |
| commit | 05288426908ecb7ed7cbff61901db5918525578a (patch) | |
| tree | 94a814cfdd53a011a10da09201ed08a6572175ff /sound/pci/hda/patch_sigmatel.c | |
| parent | b35aabd78ddae8300fda7e6a1ac6f0484ef3e804 (diff) | |
| parent | c302d6133c094bda7a7ce94eac5b50c018a7ca7b (diff) | |
Merge branch 'for-linus' into for-next
To merge HD-audio fixes back to 3.7 development line
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index c16d0f822b5..eef9c6cad25 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -1075,7 +1075,7 @@ static struct snd_kcontrol_new stac_smux_mixer = { static const char * const slave_pfxs[] = { "Front", "Surround", "Center", "LFE", "Side", - "Headphone", "Speaker", "IEC958", + "Headphone", "Speaker", "IEC958", "PCM", NULL }; |