Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release

[~andy/linux] / sound / usb / mixer_quirks.c

diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 56b665938b1b500f153ce5a7e6589c028993d3d2..e7df1e5e3f2ecd36b60ba07944dfeac1d14ff85f 100644 (file)
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -26,6 +26,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/usb/audio.h>