diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-28 10:14:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-28 10:14:45 -0300 |
| commit | 1c961da3e212de0774ee0b7690d00f79bb2a1c2a (patch) | |
| tree | f26cd97b2727250b932d2e71f1cbae7df9799a28 /linux/include | |
| parent | e362706b3e90987c5ca839def8372bff58fea7c0 (diff) | |
| parent | 34d92c680b74d3f3bd566b52873649bc3fe0dd4f (diff) | |
| download | mediapointer-dvb-s2-1c961da3e212de0774ee0b7690d00f79bb2a1c2a.tar.gz mediapointer-dvb-s2-1c961da3e212de0774ee0b7690d00f79bb2a1c2a.tar.bz2 | |
merge: http://linuxtv.org/hg/~mcisely/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/i2c-id.h | 2 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 3 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h index c8b81f419..748bbf7c3 100644 --- a/linux/include/linux/i2c-id.h +++ b/linux/include/linux/i2c-id.h @@ -112,6 +112,8 @@ #define I2C_DRIVERID_X1205 82 /* Xicor/Intersil X1205 RTC */ #define I2C_DRIVERID_PCF8563 83 /* Philips PCF8563 RTC */ #define I2C_DRIVERID_RS5C372 84 /* Ricoh RS5C372 RTC */ +#define I2C_DRIVERID_BT866 85 /* Conexant bt866 video encoder */ +#define I2C_DRIVERID_KS0127 86 /* Samsung ks0127 video decoder */ #define I2C_DRIVERID_I2CDEV 900 #define I2C_DRIVERID_ARP 902 /* SMBus ARP Client */ diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 5d46a8d2a..6e769cdb0 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -1246,7 +1246,8 @@ extern char *v4l2_type_names[]; typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file, unsigned int cmd, void *arg); -#ifdef CONFIG_VIDEO_V4L1_COMPAT +#if defined(CONFIG_VIDEO_V4L1_COMPAT) || \ + defined(CONFIG_VIDEO_V4L1_COMPAT_MODULE) int v4l_compat_translate_ioctl(struct inode *inode, struct file *file, int cmd, void *arg, v4l2_kioctl driver_ioctl); #else diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index adf4a3494..4548ede84 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -108,7 +108,7 @@ #define TUNER_TEA5767 62 /* Only FM Radio Tuner */ #define TUNER_PHILIPS_FMD1216ME_MK3 63 -#define TUNER_LG_TDVS_H062F 64 /* DViCO FusionHDTV 5 */ +#define TUNER_LG_TDVS_H06XF 64 /* TDVS H061F, H062F, H064F */ #define TUNER_YMEC_TVF66T5_B_DFF 65 /* Acorp Y878F */ #define TUNER_LG_TALN 66 #define TUNER_PHILIPS_TD1316 67 |