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

[mv-sheeva.git] / drivers / staging / se401 / se401.h

diff --git a/drivers/media/video/se401.h b/drivers/staging/se401/se401.h
similarity index 99%
rename from drivers/media/video/se401.h
rename to drivers/staging/se401/se401.h
index bf7d2e9765b0dee82c8ecb88c68e0cf6c29ed095..2758f4716c3d9b5ad48d6bb7c6b2b2dcf09b632a 100644 (file)
--- a/drivers/media/video/se401.h
+++ b/drivers/staging/se401/se401.h
@@ -3,7 +3,7 @@
 #define __LINUX_se401_H
 
 #include <linux/uaccess.h>
-#include <linux/videodev.h>
+#include "videodev.h"
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <linux/mutex.h>