diff --git a/[refs] b/[refs]
index 6e241758f582..92e9a7cd1a4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bd795bfcd7eb2f2962d458bf787d5ee0d1167cd
+refs/heads/master: 02c7b237f6a01f580319187d4bdbf712b27a5460
diff --git a/trunk/drivers/staging/comedi/comedi_compat32.c b/trunk/drivers/staging/comedi/comedi_compat32.c
index a9fdcda5db7a..581aa5fee2e3 100644
--- a/trunk/drivers/staging/comedi/comedi_compat32.c
+++ b/trunk/drivers/staging/comedi/comedi_compat32.c
@@ -26,7 +26,6 @@
 
 #define __NO_VERSION__
 #include "comedi.h"
-#include <linux/smp_lock.h>
 #include <linux/uaccess.h>
 
 #include "comedi_compat32.h"
diff --git a/trunk/drivers/staging/comedi/drivers/usbdux.c b/trunk/drivers/staging/comedi/drivers/usbdux.c
index bcf46dab2052..8942ae45708d 100644
--- a/trunk/drivers/staging/comedi/drivers/usbdux.c
+++ b/trunk/drivers/staging/comedi/drivers/usbdux.c
@@ -95,7 +95,6 @@ sampling rate. If you sample two channels you get 4kHz and so on.
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/usb.h>
-#include <linux/smp_lock.h>
 #include <linux/fcntl.h>
 #include <linux/compiler.h>
 #include <linux/firmware.h>
diff --git a/trunk/drivers/staging/comedi/drivers/usbduxfast.c b/trunk/drivers/staging/comedi/drivers/usbduxfast.c
index b96cf3b96fd3..e89b81812538 100644
--- a/trunk/drivers/staging/comedi/drivers/usbduxfast.c
+++ b/trunk/drivers/staging/comedi/drivers/usbduxfast.c
@@ -44,7 +44,6 @@
 #include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/usb.h>
-#include <linux/smp_lock.h>
 #include <linux/fcntl.h>
 #include <linux/compiler.h>
 #include "comedi_fc.h"
diff --git a/trunk/drivers/staging/panel/panel.c b/trunk/drivers/staging/panel/panel.c
index 95c93e82ccec..377884f3480d 100644
--- a/trunk/drivers/staging/panel/panel.c
+++ b/trunk/drivers/staging/panel/panel.c
@@ -41,7 +41,6 @@
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/miscdevice.h>
 #include <linux/slab.h>