Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git

[linux-2.6-omap-h63xx.git] / include / media / v4l2-common.h

diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index aecc946980a3a7da00ce0f7b90fbaf70248bf7a1..91b19921f958af283e5fc78521847c5b7785ca3c 100644 (file)
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -144,6 +144,9 @@ enum v4l2_chip_ident {
        V4L2_IDENT_CX25841 = 241,
        V4L2_IDENT_CX25842 = 242,
        V4L2_IDENT_CX25843 = 243,
+
+       /* OmniVision sensors - range 250-299 */
+       V4L2_IDENT_OV7670 = 250,
 };
 
 /* audio ioctls */
@@ -251,4 +254,8 @@ struct v4l2_crystal_freq {
    If the frequency is not supported, then -EINVAL is returned. */
 #define VIDIOC_INT_S_CRYSTAL_FREQ      _IOW ('d', 113, struct v4l2_crystal_freq)
 
+/* Initialize the sensor registors to some sort of reasonable
+   default values. */
+#define VIDIOC_INT_INIT                        _IOW ('d', 114, u32)
+
 #endif /* V4L2_COMMON_H_ */