summaryrefslogtreecommitdiffstats
path: root/sound/drivers/pcsp/pcsp_mixer.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-22 22:38:52 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-22 22:38:52 +0200
commit2528ed119b8f4fc553f9d1e65719ae183ffa97f4 (patch)
tree8ca7caff8ab0c8f6d349cb0feab360e08a3cc3d9 /sound/drivers/pcsp/pcsp_mixer.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu... (diff)
parentMerge branch 'fix/misc' into for-linus (diff)
downloadlinux-2528ed119b8f4fc553f9d1e65719ae183ffa97f4.tar.xz
linux-2528ed119b8f4fc553f9d1e65719ae183ffa97f4.zip
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
Diffstat (limited to 'sound/drivers/pcsp/pcsp_mixer.c')
-rw-r--r--sound/drivers/pcsp/pcsp_mixer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/pcsp/pcsp_mixer.c b/sound/drivers/pcsp/pcsp_mixer.c
index 771955a9be71..199b03377142 100644
--- a/sound/drivers/pcsp/pcsp_mixer.c
+++ b/sound/drivers/pcsp/pcsp_mixer.c
@@ -51,7 +51,7 @@ static int pcsp_treble_info(struct snd_kcontrol *kcontrol,
if (uinfo->value.enumerated.item > chip->max_treble)
uinfo->value.enumerated.item = chip->max_treble;
sprintf(uinfo->value.enumerated.name, "%lu",
- PCSP_CALC_RATE(uinfo->value.enumerated.item));
+ (unsigned long)PCSP_CALC_RATE(uinfo->value.enumerated.item));
return 0;
}