Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Kill truncate warning by shortening Sigmatel-specific AC97 control name
ALSA: hda - fix audio on HP TX25xx series notebooks
ALSA: pcsp - fix printk format warning again
+8
-4
+1
-1
sound/drivers/pcsp/pcsp_mixer.c
+1
-1
sound/drivers/pcsp/pcsp_mixer.c
···
51
51
if (uinfo->value.enumerated.item > chip->max_treble)
52
52
uinfo->value.enumerated.item = chip->max_treble;
53
53
sprintf(uinfo->value.enumerated.name, "%lu",
54
-
PCSP_CALC_RATE(uinfo->value.enumerated.item));
54
+
(unsigned long)PCSP_CALC_RATE(uinfo->value.enumerated.item));
55
55
return 0;
56
56
}
57
57
+5
-2
sound/pci/ac97/ac97_patch.c
+5
-2
sound/pci/ac97/ac97_patch.c
···
958
958
}
959
959
960
960
static const struct snd_kcontrol_new snd_ac97_sigmatel_4speaker =
961
-
AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch", AC97_SIGMATEL_DAC2INVERT, 2, 1, 0);
961
+
AC97_SINGLE("Sigmatel 4-Speaker Stereo Playback Switch",
962
+
AC97_SIGMATEL_DAC2INVERT, 2, 1, 0);
962
963
964
+
/* "Sigmatel " removed due to excessive name length: */
963
965
static const struct snd_kcontrol_new snd_ac97_sigmatel_phaseinvert =
964
-
AC97_SINGLE("Sigmatel Surround Phase Inversion Playback Switch", AC97_SIGMATEL_DAC2INVERT, 3, 1, 0);
966
+
AC97_SINGLE("Surround Phase Inversion Playback Switch",
967
+
AC97_SIGMATEL_DAC2INVERT, 3, 1, 0);
965
968
966
969
static const struct snd_kcontrol_new snd_ac97_sigmatel_controls[] = {
967
970
AC97_SINGLE("Sigmatel DAC 6dB Attenuate", AC97_SIGMATEL_ANALOG, 1, 1, 0),
+1
-1
sound/pci/ca0106/ca0106_mixer.c
+1
-1
sound/pci/ca0106/ca0106_mixer.c
+1
sound/pci/hda/patch_realtek.c
+1
sound/pci/hda/patch_realtek.c
···
12058
12058
SND_PCI_QUIRK(0x1028, 0x0253, "Dell OEM", ALC268_DELL),
12059
12059
SND_PCI_QUIRK(0x1028, 0x02b0, "Dell Inspiron Mini9", ALC268_DELL),
12060
12060
SND_PCI_QUIRK(0x103c, 0x30cc, "TOSHIBA", ALC268_TOSHIBA),
12061
+
SND_PCI_QUIRK(0x103c, 0x30f1, "HP TX25xx series", ALC268_TOSHIBA),
12061
12062
SND_PCI_QUIRK(0x1043, 0x1205, "ASUS W7J", ALC268_3ST),
12062
12063
SND_PCI_QUIRK(0x1179, 0xff10, "TOSHIBA A205", ALC268_TOSHIBA),
12063
12064
SND_PCI_QUIRK(0x1179, 0xff50, "TOSHIBA A305", ALC268_TOSHIBA),