Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[net-next-2.6.git] / include / media / v4l2-chip-ident.h

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 21b4428c12ab39d1846e527d40af12b9734682c2..51e89f2267b86638d68fb1a1c5dba25662db8c06 100644 (file)
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -38,6 +38,9 @@ enum {
        /* module tvaudio: reserved range 50-99 */
        V4L2_IDENT_TVAUDIO = 50,        /* A tvaudio chip, unknown which it is exactly */
 
+       /* Sony IMX074 */
+       V4L2_IDENT_IMX074 = 74,
+
        /* module saa7110: just ident 100 */
        V4L2_IDENT_SAA7110 = 100,
 
@@ -70,6 +73,7 @@ enum {
        V4L2_IDENT_OV9655 = 255,
        V4L2_IDENT_SOI968 = 256,
        V4L2_IDENT_OV9640 = 257,
+       V4L2_IDENT_OV6650 = 258,
 
        /* module saa7146: reserved range 300-309 */
        V4L2_IDENT_SAA7146 = 300,
@@ -111,6 +115,10 @@ enum {
        V4L2_IDENT_VPX3216B = 3216,
        V4L2_IDENT_VPX3220A = 3220,
 
+       /* VX855 just ident 3409 */
+       /* Other via devs could use 3314, 3324, 3327, 3336, 3364, 3353 */
+       V4L2_IDENT_VIA_VX855 = 3409,
+
        /* module tvp5150 */
        V4L2_IDENT_TVP5150 = 5150,