diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-29 17:16:30 +0200 |
---|---|---|
committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-29 17:16:30 +0200 |
commit | f4138d9a493c0e12efa98822169a6984bde8d5b2 (patch) | |
tree | 1d3636d702cde76806bb52b292af25fec3e29d0c /linux/include/media | |
parent | 1c961da3e212de0774ee0b7690d00f79bb2a1c2a (diff) | |
parent | c26243a19635a77fda4261cec814349a61e74780 (diff) | |
download | mediapointer-dvb-s2-f4138d9a493c0e12efa98822169a6984bde8d5b2.tar.gz mediapointer-dvb-s2-f4138d9a493c0e12efa98822169a6984bde8d5b2.tar.bz2 |
From: Hans Verkuil <hverkuil@xs4all.nl>
merge: from master
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/include/media')
-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, |