Mauro, Please pull from: http://linuxtv.org/hg/~awalls/cx18 for the following: cx18: Disable AC3 controls as the firmware doesn't support AC3 cx18: Increment version number due to significant changes for v4l2_subdevs cx18: Get rid of unused variables related to video output cx18: Change log lines for internal subdevs and fix tveeprom reads cx18: Fix a memory leak of buffers used for sliced VBI insertion cx18: Convert GPIO connected functions to act as v4l2_subdevices cx18: Convert I2C devices to v4l2_subdevices cx18, v4l2-chip-ident: Finish conversion of AV decoder core to v4l2_subdev cx18: Slim down instance handling, build names from v4l2_device.name cx18: Convert the integrated A/V decoder core interface to a v4l2_subdev This is the conversion of cx18 to the new v4l_device/v4l2_subdev framework, along with a few minor changes. (Note, I added a new value in v4l2-chip-ident, outside of the cx18 directory.) This set of changes will conflict with Hans' recent pull request that affects cx18-av-core.c. If your merge tools can't detect that the code Hans intends to patch simply differs in position by about 20 lines, then Hans' changes to cx18-av-core.c still should be easy enough to merge by hand. Regards, Andy diffstat: drivers/media/video/cx18/cx18-audio.c | 50 - drivers/media/video/cx18/cx18-audio.h | 2 drivers/media/video/cx18/cx18-av-core.c | 753 ++++++++++++++++------------ drivers/media/video/cx18/cx18-av-core.h | 16 drivers/media/video/cx18/cx18-av-firmware.c | 7 drivers/media/video/cx18/cx18-cards.c | 42 - drivers/media/video/cx18/cx18-cards.h | 15 drivers/media/video/cx18/cx18-controls.c | 25 drivers/media/video/cx18/cx18-driver.c | 238 ++++---- drivers/media/video/cx18/cx18-driver.h | 100 +++ drivers/media/video/cx18/cx18-fileops.c | 41 - drivers/media/video/cx18/cx18-firmware.c | 18 drivers/media/video/cx18/cx18-gpio.c | 347 ++++++++---- drivers/media/video/cx18/cx18-gpio.h | 10 drivers/media/video/cx18/cx18-i2c.c | 315 ++--------- drivers/media/video/cx18/cx18-i2c.h | 5 drivers/media/video/cx18/cx18-ioctl.c | 113 +++- drivers/media/video/cx18/cx18-streams.c | 12 drivers/media/video/cx18/cx18-vbi.c | 3 drivers/media/video/cx18/cx18-version.h | 4 drivers/media/video/cx18/cx18-video.c | 3 include/media/v4l2-chip-ident.h | 3 22 files changed, 1134 insertions(+), 988 deletions(-) -- 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