VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / include / linux / videodev.h

diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index cfcf6f1..f82a745 100644 (file)
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -222,7 +222,7 @@ struct video_window
        __u32   width,height;           /* Its size */
        __u32   chromakey;
        __u32   flags;
-       struct  video_clip *clips;      /* Set only */
+       struct  video_clip __user *clips;       /* Set only */
        int     clipcount;
 #define VIDEO_WINDOW_INTERLACE 1
 #define VIDEO_WINDOW_CHROMAKEY 16      /* Overlay by chromakey */
@@ -429,8 +429,9 @@ struct video_code
 #define VID_HARDWARE_CPIA2     33
 #define VID_HARDWARE_VICAM      34
 #define VID_HARDWARE_SF16FMR2  35
-#define VID_HARDWARE_W9968CF    36
+#define VID_HARDWARE_W9968CF   36
 #define VID_HARDWARE_SAA7114H   37
+#define VID_HARDWARE_SN9C102   38
 #endif /* __LINUX_VIDEODEV_H */
 
 /*