Merge branch 'for-2638/i2c/omap' into for-linus/i2c-2638

[~andy/linux] / fs / compat_ioctl.c

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index a1a8f0c6735f0251cdf4ae3d56aa380a1f47843a..61abb638b4bfdcef8c2a47446fb778714b9b25b8 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -19,7 +19,6 @@
 #include <linux/compiler.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/ioctl.h>
 #include <linux/if.h>
 #include <linux/if_bridge.h>
@@ -43,7 +42,7 @@
 #include <linux/tty.h>
 #include <linux/vt_kern.h>
 #include <linux/fb.h>
-#include <linux/videodev.h>
+#include <linux/videodev2.h>
 #include <linux/netdevice.h>
 #include <linux/raw.h>
 #include <linux/blkdev.h>