diff options
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/Kconfig | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-i2c.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/v4l2-common.c | 2 | ||||
| -rw-r--r-- | v4l2-spec/pixfmt.sgml | 7 |
4 files changed, 9 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/ttpci/Kconfig b/linux/drivers/media/dvb/ttpci/Kconfig index 68eb4493f..d8d4214fd 100644 --- a/linux/drivers/media/dvb/ttpci/Kconfig +++ b/linux/drivers/media/dvb/ttpci/Kconfig @@ -1,5 +1,6 @@ config TTPCI_EEPROM tristate + depends on I2C default n config DVB_AV7110 diff --git a/linux/drivers/media/video/em28xx/em28xx-i2c.c b/linux/drivers/media/video/em28xx/em28xx-i2c.c index 1cdd88361..24eebd4a3 100644 --- a/linux/drivers/media/video/em28xx/em28xx-i2c.c +++ b/linux/drivers/media/video/em28xx/em28xx-i2c.c @@ -461,7 +461,7 @@ static struct i2c_algorithm em28xx_algo = { static struct i2c_adapter em28xx_adap_template = { .owner = THIS_MODULE, -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) .class = I2C_CLASS_TV_ANALOG, #endif .name = "em28xx", diff --git a/linux/drivers/media/video/v4l2-common.c b/linux/drivers/media/video/v4l2-common.c index ab91734b1..864ee0772 100644 --- a/linux/drivers/media/video/v4l2-common.c +++ b/linux/drivers/media/video/v4l2-common.c @@ -1066,7 +1066,7 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_cfg(struct v4l2_device *v4l2_dev, u8 addr, const unsigned short *probe_addrs) { struct v4l2_subdev *sd = NULL; - struct i2c_client *client; + struct i2c_client *client = NULL; BUG_ON(!v4l2_dev); diff --git a/v4l2-spec/pixfmt.sgml b/v4l2-spec/pixfmt.sgml index 36a6934c7..499cdacda 100644 --- a/v4l2-spec/pixfmt.sgml +++ b/v4l2-spec/pixfmt.sgml @@ -724,9 +724,14 @@ kernel sources in the file <filename>Documentation/video4linux/cx2341x/README.hm <entry>'M310'</entry> <entry>Compressed BGGR Bayer format used by the gspca driver.</entry> </row> + <row id="V4L2-PIX-FMT-OV511"> + <entry><constant>V4L2_PIX_FMT_OV511</constant></entry> + <entry>'O511'</entry> + <entry>OV511 JPEG format used by the gspca driver.</entry> + </row> <row id="V4L2-PIX-FMT-OV518"> <entry><constant>V4L2_PIX_FMT_OV518</constant></entry> - <entry>'0518'</entry> + <entry>'O518'</entry> <entry>OV518 JPEG format used by the gspca driver.</entry> </row> <row id="V4L2-PIX-FMT-PJPG"> |