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 / usbvideo.h

diff --git a/drivers/media/video/usbvideo/usbvideo.h b/drivers/staging/usbvideo/usbvideo.h
similarity index 99%
rename from drivers/media/video/usbvideo/usbvideo.h
rename to drivers/staging/usbvideo/usbvideo.h
index c66985beb8c9dfdfcf364547af4a5c8d0e413d95..95638a072b190cbd6669d6fd0ac4b8f3974e8ebe 100644 (file)
--- a/drivers/media/video/usbvideo/usbvideo.h
+++ b/drivers/staging/usbvideo/usbvideo.h
@@ -16,7 +16,7 @@
 #ifndef usbvideo_h
 #define        usbvideo_h
 
-#include <linux/videodev.h>
+#include "videodev.h"
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <linux/usb.h>