diff --git a/[refs] b/[refs]
index b6ffbc433cca..f2d65ad9f538 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed1d77b18c9f4ff06d5b42c65041aa55a1447053
+refs/heads/master: 2811036a19624168ff9342bb85421dbbb1d2ac0d
diff --git a/trunk/drivers/staging/cx25821/cx25821.h b/trunk/drivers/staging/cx25821/cx25821.h
index acfd0176a184..c94000125782 100644
--- a/trunk/drivers/staging/cx25821/cx25821.h
+++ b/trunk/drivers/staging/cx25821/cx25821.h
@@ -31,6 +31,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>