diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-30 20:10:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-07-30 20:10:43 -0300 |
| commit | 9a373df780905ef4e981bae11edccba07d94e305 (patch) | |
| tree | 5339c90619daa9375c5ca37023b40eea1a8f932e /linux/include | |
| parent | 49baec9371209e4c77da0321f577b9a33be0fe48 (diff) | |
| parent | 74171fb0a60787bfd13f6a4a98450f0f5ed4d0dc (diff) | |
| download | mediapointer-dvb-s2-9a373df780905ef4e981bae11edccba07d94e305.tar.gz mediapointer-dvb-s2-9a373df780905ef4e981bae11edccba07d94e305.tar.bz2 | |
merge: http://kernellabs.com/hg/~mkrufky/cx23885
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 2 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 50dd2a51b..b61c3b61c 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -252,10 +252,12 @@ struct v4l2_capability { #define V4L2_CAP_RDS_CAPTURE 0x00000100 /* RDS data capture */ #define V4L2_CAP_VIDEO_OUTPUT_OVERLAY 0x00000200 /* Can do video output overlay */ #define V4L2_CAP_HW_FREQ_SEEK 0x00000400 /* Can do hardware frequency seek */ +#define V4L2_CAP_RDS_OUTPUT 0x00000800 /* Is an RDS encoder */ #define V4L2_CAP_TUNER 0x00010000 /* has a tuner */ #define V4L2_CAP_AUDIO 0x00020000 /* has audio support */ #define V4L2_CAP_RADIO 0x00040000 /* is a radio device */ +#define V4L2_CAP_MODULATOR 0x00080000 /* has a modulator */ #define V4L2_CAP_READWRITE 0x01000000 /* read/write systemcalls */ #define V4L2_CAP_ASYNCIO 0x02000000 /* async I/O */ diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index cbf97f45f..c146f2f53 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -126,6 +126,7 @@ #define TUNER_PHILIPS_FMD1216MEX_MK3 78 #define TUNER_PHILIPS_FM1216MK5 79 #define TUNER_PHILIPS_FQ1216LME_MK3 80 /* Active loopthrough, no FM */ +#define TUNER_PARTSNIC_PTI_5NF05 81 /* tv card specific */ #define TDA9887_PRESENT (1<<0) |