Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / include / media / v4l2-chip-ident.h

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index b3edb67a83114e10af4409a46388187c84a5c53e..63fd9d3db296aae685bc0672daadd9f4d703a92e 100644 (file)
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -76,6 +76,7 @@ enum {
        V4L2_IDENT_OV6650 = 258,
        V4L2_IDENT_OV2640 = 259,
        V4L2_IDENT_OV9740 = 260,
+       V4L2_IDENT_OV5642 = 261,
 
        /* module saa7146: reserved range 300-309 */
        V4L2_IDENT_SAA7146 = 300,
@@ -185,8 +186,9 @@ enum {
        /* module wm8775: just ident 8775 */
        V4L2_IDENT_WM8775 = 8775,
 
-       /* module cafe_ccic, just ident 8801 */
+       /* Marvell controllers starting at 8801 */
        V4L2_IDENT_CAFE = 8801,
+       V4L2_IDENT_ARMADA610 = 8802,
 
        /* AKM AK8813/AK8814 */
        V4L2_IDENT_AK8813 = 8813,