summaryrefslogtreecommitdiff
path: root/linux/include/media/v4l2-common.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-05-15 23:38:31 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-05-15 23:38:31 -0300
commit09face28b78569cdcc7c6ab30a96e8548c85f319 (patch)
tree012542b31853970a3efda0ece7a3c1e697e95ffd /linux/include/media/v4l2-common.h
parentad8c1665001c90893f44e6cb1d22a8309d16e16b (diff)
parente4a9fb69a7c69cc46bd393234766c32403ad8f56 (diff)
downloadmediapointer-dvb-s2-09face28b78569cdcc7c6ab30a96e8548c85f319.tar.gz
mediapointer-dvb-s2-09face28b78569cdcc7c6ab30a96e8548c85f319.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/cx88
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media/v4l2-common.h')
-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,