From 8feb2c32df4ab886e7e795ddbc576d1b0a130c91 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 13 Jul 2009 12:39:05 +0200
Subject: [PATCH] --- yaml --- r: 155355 b: refs/heads/master c:
 1d03d2bd6e6421224d618b120348bd5ee328d96a h: refs/heads/master i:   155353:
 20bf94940c29a9a0b79b613d31026bdccc453518   155351:
 59b1249a329dfec139533283b5b902b5ca77916f v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/go7007/s2250-loader.c | 1 +
 trunk/drivers/staging/usbip/usbip_common.c  | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9532d376351e..e43c75b15963 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7638d5322bd89d49e013a03fe2afaeb6d214fabd
+refs/heads/master: 1d03d2bd6e6421224d618b120348bd5ee328d96a
diff --git a/trunk/drivers/staging/go7007/s2250-loader.c b/trunk/drivers/staging/go7007/s2250-loader.c
index a5e4acab089e..bb22347af60e 100644
--- a/trunk/drivers/staging/go7007/s2250-loader.c
+++ b/trunk/drivers/staging/go7007/s2250-loader.c
@@ -17,6 +17,7 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/smp_lock.h>
 #include <linux/usb.h>
 #include <dvb-usb.h>
 
diff --git a/trunk/drivers/staging/usbip/usbip_common.c b/trunk/drivers/staging/usbip/usbip_common.c
index 22f93dd0ba03..251220dc8851 100644
--- a/trunk/drivers/staging/usbip/usbip_common.c
+++ b/trunk/drivers/staging/usbip/usbip_common.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/smp_lock.h>
 #include <linux/file.h>
 #include <linux/tcp.h>
 #include <linux/in.h>