diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-27 11:20:43 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-27 11:20:43 -0300 |
| commit | 1ddb193e59cc2b76550742b5099500b38bdf6668 (patch) | |
| tree | 2edfe688f579e2ae152f9da7dcd8894d6d57621b /linux/include | |
| parent | e6f2467bcc7b9ca1e7de8cd2ea21b2af83892c9d (diff) | |
| parent | 9a2bbcda776b51c070c6859a114fb00b06f1e392 (diff) | |
| download | mediapointer-dvb-s2-1ddb193e59cc2b76550742b5099500b38bdf6668.tar.gz mediapointer-dvb-s2-1ddb193e59cc2b76550742b5099500b38bdf6668.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/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 |
2 files changed, 4 insertions, 1 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 |