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

[pandora-kernel.git] / include / media / v4l2-chip-ident.h

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index bf937d3..21b4428 100644 (file)
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -178,6 +178,10 @@ enum {
        /* module cafe_ccic, just ident 8801 */
        V4L2_IDENT_CAFE = 8801,
 
+       /* AKM AK8813/AK8814 */
+       V4L2_IDENT_AK8813 = 8813,
+       V4L2_IDENT_AK8814 = 8814,
+
        /* module cx23885 and cx25840 */
        V4L2_IDENT_CX23885    = 8850,
        V4L2_IDENT_CX23885_AV = 8851, /* Integrated A/V decoder */
@@ -293,6 +297,11 @@ enum {
        /* module cs53132a: just ident 53132 */
        V4L2_IDENT_CS53l32A = 53132,
 
+       /* modules upd61151 MPEG2 encoder: just ident 54000 */
+       V4L2_IDENT_UPD61161 = 54000,
+       /* modules upd61152 MPEG2 encoder with AC3: just ident 54001 */
+       V4L2_IDENT_UPD61162 = 54001,
+
        /* module upd64031a: just ident 64031 */
        V4L2_IDENT_UPD64031A = 64031,