diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-05-08 23:01:21 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-05-08 23:01:21 +0200 |
| commit | 09036418acae9168c24f02a17513bda867e9d42a (patch) | |
| tree | 66a761d531552125aceb2c9a0f2794b9569a3b95 /linux/include | |
| parent | 1b0cb8ac7fbb1369e34b40e7cc05c4c948ae4ce1 (diff) | |
| parent | 1de6f4cd655f4ebf23c5df5734b40dab8e6c905a (diff) | |
| download | mediapointer-dvb-s2-09036418acae9168c24f02a17513bda867e9d42a.tar.gz mediapointer-dvb-s2-09036418acae9168c24f02a17513bda867e9d42a.tar.bz2 | |
Merge: from master.
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
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, |