Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

[safe/jmp/linux-2.6] / include / media / v4l2-chip-ident.h

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index f02517b..11a4a2d 100644 (file)
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -70,6 +70,9 @@ enum {
        V4L2_IDENT_CX23416 = 416,
        V4L2_IDENT_CX23418 = 418,
 
+       /* module au0828 */
+       V4L2_IDENT_AU0828 = 828,
+
        /* module indycam: just ident 2000 */
        V4L2_IDENT_INDYCAM = 2000,
 
@@ -131,6 +134,15 @@ enum {
        /* module saa7185: just ident 7185 */
        V4L2_IDENT_SAA7185 = 7185,
 
+       /* module saa7191: just ident 7191 */
+       V4L2_IDENT_SAA7191 = 7191,
+
+       /* module ths7303: just ident 7303 */
+       V4L2_IDENT_THS7303 = 7303,
+
+       /* module adv7343: just ident 7343 */
+       V4L2_IDENT_ADV7343 = 7343,
+
        /* module wm8739: just ident 8739 */
        V4L2_IDENT_WM8739 = 8739,
 
@@ -140,20 +152,14 @@ enum {
        /* module tda9840: just ident 9840 */
        V4L2_IDENT_TDA9840 = 9840,
 
-       /* module tw9910: just ident 9910 */
-       V4L2_IDENT_TW9910 = 9910,
+       /* module cafe_ccic, just ident 8801 */
+       V4L2_IDENT_CAFE = 8801,
 
-       /* module cs53132a: just ident 53132 */
-       V4L2_IDENT_CS53l32A = 53132,
+       /* module mt9v011, just ident 8243 */
+       V4L2_IDENT_MT9V011 = 8243,
 
-       /* module upd64031a: just ident 64031 */
-       V4L2_IDENT_UPD64031A = 64031,
-
-       /* module upd64083: just ident 64083 */
-       V4L2_IDENT_UPD64083 = 64083,
-
-       /* module m52790: just ident 52790 */
-       V4L2_IDENT_M52790 = 52790,
+       /* module tw9910: just ident 9910 */
+       V4L2_IDENT_TW9910 = 9910,
 
        /* module msp3400: reserved range 34000-34999 and 44000-44999 */
        V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
@@ -231,6 +237,18 @@ enum {
        V4L2_IDENT_MT9V022IX7ATC        = 45010, /* No way to detect "normal" I77ATx */
        V4L2_IDENT_MT9V022IX7ATM        = 45015, /* and "lead free" IA7ATx chips */
        V4L2_IDENT_MT9T031              = 45020,
+
+       /* module cs53132a: just ident 53132 */
+       V4L2_IDENT_CS53l32A = 53132,
+
+       /* module upd64031a: just ident 64031 */
+       V4L2_IDENT_UPD64031A = 64031,
+
+       /* module upd64083: just ident 64083 */
+       V4L2_IDENT_UPD64083 = 64083,
+
+       /* module m52790: just ident 52790 */
+       V4L2_IDENT_M52790 = 52790,
 };
 
 #endif