Merge branch 'topic/misc' into for-linus

This commit is contained in:
Takashi Iwai
2009-03-24 00:35:50 +01:00
60 changed files with 491 additions and 277 deletions

View File

@@ -57,7 +57,7 @@ static int __devinit snd_pcsp_create(struct snd_card *card)
else
min_div = MAX_DIV;
#if PCSP_DEBUG
printk("PCSP: lpj=%li, min_div=%i, res=%li\n",
printk(KERN_DEBUG "PCSP: lpj=%li, min_div=%i, res=%li\n",
loops_per_jiffy, min_div, tp.tv_nsec);
#endif