diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-22 21:29:08 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-22 21:29:08 +0400 |
| commit | 4986cab5551cd22e6a57d5e2511b80d38669e1ca (patch) | |
| tree | d0ddbeabecf035762cd76863494a6182968586ef /sound/pci/ca0106/ca0106_mixer.c | |
| parent | 89b7161c48f4b7acd5cb70d7da6b3abf3fe982d1 (diff) | |
| parent | afe6d7e3c4a9aba020637f4ae15527a89ba31f21 (diff) | |
| download | linux-4986cab5551cd22e6a57d5e2511b80d38669e1ca.tar.xz | |
Merge branch 'fix/misc' into for-linus
* fix/misc:
ALSA: Kill truncate warning by shortening Sigmatel-specific AC97 control name
ALSA: pcsp - fix printk format warning again
Diffstat (limited to 'sound/pci/ca0106/ca0106_mixer.c')
| -rw-r--r-- | sound/pci/ca0106/ca0106_mixer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index ad2888705d2a..c111efe61c3c 100644 --- a/sound/pci/ca0106/ca0106_mixer.c +++ b/sound/pci/ca0106/ca0106_mixer.c @@ -800,7 +800,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu) "Capture Volume", "External Amplifier", "Sigmatel 4-Speaker Stereo Playback Switch", - "Sigmatel Surround Phase Inversion Playback ", + "Surround Phase Inversion Playback Switch", NULL }; static char *ca0106_rename_ctls[] = { |