The patch number 8094 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Fixed a small merge conflicts at:
merging linux/drivers/media/video/cx18/cx18-cards.h
warning: conflicts during merge.
merging linux/drivers/media/video/cx18/cx18-cards.h failed!
Basically, two new structures were added bellow the same place
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/video/cx18/cx18-cards.c | 55
linux/drivers/media/video/cx18/cx18-cards.h | 8
linux/drivers/media/video/cx18/cx18-controls.c | 227 -
linux/drivers/media/video/cx18/cx18-controls.h | 9
linux/drivers/media/video/cx18/cx18-driver.c | 12
linux/drivers/media/video/cx18/cx18-driver.h | 4
linux/drivers/media/video/cx18/cx18-gpio.c | 34
linux/drivers/media/video/cx18/cx18-gpio.h | 1
linux/drivers/media/video/cx18/cx18-i2c.c | 20
linux/drivers/media/video/cx18/cx18-ioctl.c | 1521 +++++-----
linux/drivers/media/video/cx18/cx18-ioctl.h | 6
linux/drivers/media/video/cx18/cx18-streams.c | 4
linux/drivers/media/video/ivtv/ivtv-controls.c | 228 -
linux/drivers/media/video/ivtv/ivtv-controls.h | 8
linux/drivers/media/video/ivtv/ivtv-driver.c | 10
linux/drivers/media/video/ivtv/ivtv-fileops.c | 25
linux/drivers/media/video/ivtv/ivtv-ioctl.c | 2514 ++++++++---------
linux/drivers/media/video/ivtv/ivtv-ioctl.h | 9
linux/drivers/media/video/ivtv/ivtv-streams.c | 3
linux/drivers/media/video/videodev.c | 282 -
linux/include/media/v4l2-dev.h | 4
21 files changed, 2627 insertions(+), 2357 deletions(-)
<diff discarded since it is too big>
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/be10ab6de004605584c98a01d9405b0fefa6d8ef
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
