diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-17 11:17:44 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-17 11:17:44 -0300 |
| commit | ee117cb21fc99d6d1ef141b62ac07c2c99ed6558 (patch) | |
| tree | b3109826151f5b2cacd01a2a78fc51079381fec7 /linux/include/media | |
| parent | 3c34c6c8fa0c2f378cdad415e8f15c0938c28cb8 (diff) | |
| parent | 26642526dd562aa77049bb56d5bf9ad64158c767 (diff) | |
| download | mediapointer-dvb-s2-ee117cb21fc99d6d1ef141b62ac07c2c99ed6558.tar.gz mediapointer-dvb-s2-ee117cb21fc99d6d1ef141b62ac07c2c99ed6558.tar.bz2 | |
merge: http://kernellabs.com/hg/~mkrufky/saa7164
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/tuner.h | 2 | ||||
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index c146f2f53..4d5b53ff1 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -127,6 +127,8 @@ #define TUNER_PHILIPS_FM1216MK5 79 #define TUNER_PHILIPS_FQ1216LME_MK3 80 /* Active loopthrough, no FM */ #define TUNER_PARTSNIC_PTI_5NF05 81 +#define TUNER_PHILIPS_CU1216L 82 +#define TUNER_NXP_TDA18271 83 /* tv card specific */ #define TDA9887_PRESENT (1<<0) diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 1cae97561..f813ae9c0 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -105,6 +105,10 @@ struct video_device Also note that vdev->minor is set to -1 if the registration failed. */ int __must_check video_register_device(struct video_device *vdev, int type, int nr); +/* Same as video_register_device, but no warning is issued if the desired + device node number was already in use. */ +int __must_check video_register_device_no_warn(struct video_device *vdev, int type, int nr); + /* Unregister video devices. Will do nothing if vdev == NULL or vdev->minor < 0. */ void video_unregister_device(struct video_device *vdev); |