Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / usbvideo / vicam.c

diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/staging/usbvideo/vicam.c
similarity index 99%
rename from drivers/media/video/usbvideo/vicam.c
rename to drivers/staging/usbvideo/vicam.c
index dc17cce2fbb6d39104979b6e51260d8cf21fff07..ecdb121297c9e3d4de38c95830250aed84bb369b 100644 (file)
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/staging/usbvideo/vicam.c
@@ -38,7 +38,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/videodev.h>
+#include "videodev.h"
 #include <linux/usb.h>
 #include <linux/vmalloc.h>
 #include <linux/mm.h>