Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs into...

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

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 0ea0bd85c0368543dae9bc754e7cd97dd50be61d..41b509babf3f4e895878118fd799b1b4d8e664cd 100644 (file)
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -64,6 +64,7 @@ enum {
        /* Conexant MPEG encoder/decoders: reserved range 410-420 */
        V4L2_IDENT_CX23415 = 415,
        V4L2_IDENT_CX23416 = 416,
+       V4L2_IDENT_CX23418 = 418,
 
        /* module vp27smpx: just ident 2700 */
        V4L2_IDENT_VP27SMPX = 2700,
@@ -89,7 +90,10 @@ enum {
        /* module m52790: just ident 52790 */
        V4L2_IDENT_M52790 = 52790,
 
-       /* module msp34xx: reserved range 34000-34999 */
+       /* module msp3400: reserved range 34000-34999 and 44000-44999 */
+       V4L2_IDENT_MSPX4XX  = 34000, /* generic MSPX4XX identifier, only
+                                       use internally (tveeprom.c). */
+
        V4L2_IDENT_MSP3400B = 34002,
        V4L2_IDENT_MSP3410B = 34102,
 
@@ -141,7 +145,7 @@ enum {
        V4L2_IDENT_MSP3457G = 34577,
        V4L2_IDENT_MSP3467G = 34677,
 
-       /* module msp44xx: reserved range 44000-44999 */
+       /* module msp3400: reserved range 34000-34999 and 44000-44999 */
        V4L2_IDENT_MSP4400G = 44007,
        V4L2_IDENT_MSP4410G = 44107,
        V4L2_IDENT_MSP4420G = 44207,