summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-05-15 23:37:37 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-05-15 23:37:37 -0300
commite4a9fb69a7c69cc46bd393234766c32403ad8f56 (patch)
treedcf44c052a8a2d7f8603626d2611a221c73b0a47 /linux/include
parentda14f3340bd6879661ed106f47b8ae0101594e22 (diff)
parenta678371aaa80825811e0e97e74021c11776704a2 (diff)
downloadmediapointer-dvb-s2-e4a9fb69a7c69cc46bd393234766c32403ad8f56.tar.gz
mediapointer-dvb-s2-e4a9fb69a7c69cc46bd393234766c32403ad8f56.tar.bz2
merge: http://linuxtv.org/hg/~quincy/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/media/v4l2-common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h
index 6ffa8eabb..31223f4eb 100644
--- a/linux/include/media/v4l2-common.h
+++ b/linux/include/media/v4l2-common.h
@@ -118,6 +118,8 @@ enum v4l2_chip_ident {
V4L2_IDENT_SAA7129 = 159,
/* module cx25840: reserved range 200-249 */
+ V4L2_IDENT_CX25836 = 236,
+ V4L2_IDENT_CX25837 = 237,
V4L2_IDENT_CX25840 = 240,
V4L2_IDENT_CX25841 = 241,
V4L2_IDENT_CX25842 = 242,