diff --git a/[refs] b/[refs]
index 53cc4d8a4c3e..d1c46fe6b35a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02b20b0b4cde011f7ad6b5363fb88b93f7ad4e5b
+refs/heads/master: 466a1c15b5dff85810cb86d6b37b96b07846cd82
diff --git a/trunk/drivers/staging/cx25821/cx25821.h b/trunk/drivers/staging/cx25821/cx25821.h
index 074ea34c3b25..578cdd51ae5f 100644
--- a/trunk/drivers/staging/cx25821/cx25821.h
+++ b/trunk/drivers/staging/cx25821/cx25821.h
@@ -32,6 +32,7 @@
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/kdev_t.h>
+#include <linux/smp_lock.h>
 
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>