Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6] / drivers / media / video / cpia.h

diff --git a/drivers/media/video/cpia.h b/drivers/media/video/cpia.h
index 6eaa692021c58f61c52843df4e60bea7172cddb1..78392fb6f94ea3dd8b430f338024b73d86a5842c 100644 (file)
--- a/drivers/media/video/cpia.h
+++ b/drivers/media/video/cpia.h
@@ -47,7 +47,6 @@
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
 #include <linux/list.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 
 struct cpia_camera_ops