diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-22 19:29:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-22 19:29:08 +0200 |
| commit | 4986cab5551cd22e6a57d5e2511b80d38669e1ca (patch) | |
| tree | d0ddbeabecf035762cd76863494a6182968586ef /sound/pci | |
| parent | 89b7161c48f4b7acd5cb70d7da6b3abf3fe982d1 (diff) | |
| parent | afe6d7e3c4a9aba020637f4ae15527a89ba31f21 (diff) | |
| download | kernel-crypto-4986cab5551cd22e6a57d5e2511b80d38669e1ca.tar.gz kernel-crypto-4986cab5551cd22e6a57d5e2511b80d38669e1ca.tar.xz kernel-crypto-4986cab5551cd22e6a57d5e2511b80d38669e1ca.zip | |
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')
| -rw-r--r-- | sound/pci/ac97/ac97_patch.c | 7 | ||||
| -rw-r--r-- | sound/pci/ca0106/ca0106_mixer.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c index 81bc93e5f1e..7337abdbe4e 100644 --- a/sound/pci/ac97/ac97_patch.c +++ b/sound/pci/ac97/ac97_patch.c @@ -958,10 +958,13 @@ static int patch_sigmatel_stac9708_3d(struct snd_ac97 * ac97) } static const struct snd_kcontrol_new snd_ac97_sigmatel_4speaker = -AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch", AC97_SIGMATEL_DAC2INVERT, 2, 1, 0); +AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch", + AC97_SIGMATEL_DAC2INVERT, 2, 1, 0); +/* "Sigmatel " removed due to excessive name length: */ static const struct snd_kcontrol_new snd_ac97_sigmatel_phaseinvert = -AC97_SINGLE("Sigmatel Surround Phase Inversion Playback Switch", AC97_SIGMATEL_DAC2INVERT, 3, 1, 0); +AC97_SINGLE("Surround Phase Inversion Playback Switch", + AC97_SIGMATEL_DAC2INVERT, 3, 1, 0); static const struct snd_kcontrol_new snd_ac97_sigmatel_controls[] = { AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0), diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c index ad2888705d2..c111efe61c3 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[] = { |