From 23627d3dce98ecda76e9fa8c65f70027e1f84ba5 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 29 Mar 2010 16:02:50 +1100
Subject: [PATCH] --- yaml --- r: 193231 b: refs/heads/master c:
 36db0456582484aa78809376f1e41ec2873fc9d5 h: refs/heads/master i:   193229:
 a702e18700d67a7b0a652bc9d8bab171a879bc71   193227:
 f84fd7c724e65dcc1bb64d0e81ac26f741b47b1f   193223:
 8941c81372d2586dcc84a9497ffdbc8a6bab37a1   193215:
 2cf718a4d04abd7eb9546202c8db081e678205a4 v: v3

---
 [refs]                         | 2 +-
 trunk/sound/usb/endpoint.c     | 1 +
 trunk/sound/usb/format.c       | 1 +
 trunk/sound/usb/helper.c       | 1 +
 trunk/sound/usb/mixer_quirks.c | 1 +
 trunk/sound/usb/quirks.c       | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 51a463d8c61e..0ac919ee2b03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fca5bca48759c21eddc0667a4582a227d7b0165a
+refs/heads/master: 36db0456582484aa78809376f1e41ec2873fc9d5
diff --git a/trunk/sound/usb/endpoint.c b/trunk/sound/usb/endpoint.c
index 7b84b61a0784..ef07a6d0dd5f 100644
--- a/trunk/sound/usb/endpoint.c
+++ b/trunk/sound/usb/endpoint.c
@@ -16,6 +16,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/usb/audio.h>
 #include <linux/usb/audio-v2.h>
diff --git a/trunk/sound/usb/format.c b/trunk/sound/usb/format.c
index fcadedd94543..b87cf87c4e7b 100644
--- a/trunk/sound/usb/format.c
+++ b/trunk/sound/usb/format.c
@@ -16,6 +16,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/usb/audio.h>
 #include <linux/usb/audio-v2.h>
diff --git a/trunk/sound/usb/helper.c b/trunk/sound/usb/helper.c
index ba7dba4d5cf2..d48d6f8f6ac9 100644
--- a/trunk/sound/usb/helper.c
+++ b/trunk/sound/usb/helper.c
@@ -16,6 +16,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 
 #include "usbaudio.h"
diff --git a/trunk/sound/usb/mixer_quirks.c b/trunk/sound/usb/mixer_quirks.c
index 56b665938b1b..e7df1e5e3f2e 100644
--- a/trunk/sound/usb/mixer_quirks.c
+++ b/trunk/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>
 
diff --git a/trunk/sound/usb/quirks.c b/trunk/sound/usb/quirks.c
index d4ced64e465b..136e5b4cf6de 100644
--- a/trunk/sound/usb/quirks.c
+++ b/trunk/sound/usb/quirks.c
@@ -15,6 +15,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 #include <linux/usb/audio.h>