Merge remote branch 'alsa/devel' into topic/misc

2010-04-16 15:20:06 +02:00
parent 1cff399ecd 0340c7dccd
commit cf0dbba515
4858 changed files with 37232 additions and 13111 deletions
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@ -24,6 +24,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/version.h>
 #include <sound/core.h>
 #include <sound/tea575x-tuner.h>