diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-15 23:31:34 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-05-15 23:31:34 -0300 |
commit | a678371aaa80825811e0e97e74021c11776704a2 (patch) | |
tree | 845b101676c1d56c459709af411e11d503d145d1 /linux/include | |
parent | 6d1687f3c08ec5c408b776e3e291bc8a383091e4 (diff) | |
parent | 09036418acae9168c24f02a17513bda867e9d42a (diff) | |
download | mediapointer-dvb-s2-a678371aaa80825811e0e97e74021c11776704a2.tar.gz mediapointer-dvb-s2-a678371aaa80825811e0e97e74021c11776704a2.tar.bz2 |
merge: http://linuxtv.org/hg/~hverkuil/cx25836
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.h | 2 |
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, |