Hi Mauro, Please pull from http://www.linuxtv.org/hg/~hverkuil/v4l-dvb for the following: - v4l-dvb: add missing DMA_BIT_MASK compat macro for kernels <2.6.24 - ivtv: fix compiler warning. - uvc: fix compile warning - tuner: remove tuner_i2c_address_check - v4l2: add v4l2_device_set_name() - ivtv: use v4l2_device_set_name. - v4l2-device: unregister i2c_clients when unregistering the v4l2_device. - ivtv: fix incorrect bit tests - ivtv/radio: fix V4L2_TUNER_MODE/V4L2_TUNER_SUB confusion - radio-fm16: cleanups - radio-fm16: fix g_tuner. - v4l2-spec: fix V4L2_TUNER_MODE_STEREO doc. Note that there are a few high-prio fixes: - ivtv: fix compiler warning. - uvc: fix compile warning - ivtv: fix incorrect bit tests - ivtv/radio: fix V4L2_TUNER_MODE/V4L2_TUNER_SUB confusion These should go into 2.6.30. Laurent, I've CC-ed you due to the uvc change. Mauro, the handling of rxsubchans and audmode in tvaudio.c and bttv-audio-hook.c is broken (V4L2_TUNER_MODE and V4L2_TUNER_SUB are mixed-up). I did fix tvaudio.c but I have no boards to test it with and I also think that it can only be merged if bttv-audio-hook.c is also fixed. I will mail you my tvaudio.c diff. I don't have the time to work on bttv-audio-hook.c, unfortunately. Thanks, Hans diffstat: linux/Documentation/video4linux/v4l2-framework.txt | 5 ++ linux/drivers/media/radio/radio-sf16fmi.c | 20 ++------ linux/drivers/media/radio/radio-sf16fmr2.c | 26 +++------- linux/drivers/media/video/ivtv/ivtv-driver.c | 16 +++--- linux/drivers/media/video/ivtv/ivtv-gpio.c | 4 - linux/drivers/media/video/ivtv/ivtv-ioctl.c | 5 +- linux/drivers/media/video/ivtv/ivtv-irq.c | 2 linux/drivers/media/video/ivtv/ivtv-yuv.c | 3 - linux/drivers/media/video/ivtv/ivtvfb.c | 3 - linux/drivers/media/video/tuner-core.c | 52 --------------------- linux/drivers/media/video/uvc/uvc_driver.c | 9 ++- linux/drivers/media/video/v4l2-common.c | 4 - linux/drivers/media/video/v4l2-device.c | 29 +++++++++++ linux/include/media/v4l2-device.h | 21 ++++++++ linux/include/media/v4l2-subdev.h | 5 ++ v4l/compat.h | 2 v4l2-spec/Makefile | 2 v4l2-spec/v4l2.sgml | 2 v4l2-spec/vidioc-g-tuner.sgml | 4 - 19 files changed, 107 insertions(+), 107 deletions(-) -- Hans Verkuil - video4linux developer - sponsored by TANDBERG Telecom -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
