Merge branch 'akpm' (Andrew's incoming - part two)

[mv-sheeva.git] / include / media / v4l2-chip-ident.h

diff --git a/include/media/v4l2-chip-ident.h b/include/media/v4l2-chip-ident.h
index 63fd9d3db296aae685bc0672daadd9f4d703a92e..810a20928a2177fa8e6bdf1ffae6c929d1c78fc5 100644 (file)
--- a/include/media/v4l2-chip-ident.h
+++ b/include/media/v4l2-chip-ident.h
@@ -212,9 +212,6 @@ enum {
        /* module sn9c20x: just ident 10000 */
        V4L2_IDENT_SN9C20X = 10000,
 
-       /* Siliconfile sensors: reserved range 10100 - 10199 */
-       V4L2_IDENT_NOON010PC30  = 10100,
-
        /* module cx231xx and cx25840 */
        V4L2_IDENT_CX2310X_AV = 23099, /* Integrated A/V decoder; not in '100 */
        V4L2_IDENT_CX23100    = 23100,