The patch number 8916 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://linuxtv.org/hg/~awalls/v4l-dvb
Fixed a trivial conflict between a janitor's patch from Hans Verkuil and
Andy patch series.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/drivers/media/video/cx18/Makefile | 2
linux/drivers/media/video/cx18/cx18-audio.c | 5
linux/drivers/media/video/cx18/cx18-av-core.c | 12 -
linux/drivers/media/video/cx18/cx18-av-firmware.c | 7
linux/drivers/media/video/cx18/cx18-driver.c | 34 +-
linux/drivers/media/video/cx18/cx18-driver.h | 47 ----
linux/drivers/media/video/cx18/cx18-dvb.c | 5
linux/drivers/media/video/cx18/cx18-fileops.c | 13 -
linux/drivers/media/video/cx18/cx18-firmware.c | 164 +++++++-------
linux/drivers/media/video/cx18/cx18-gpio.c | 15 -
linux/drivers/media/video/cx18/cx18-i2c.c | 47 ++--
linux/drivers/media/video/cx18/cx18-io.c | 139 +++++++++++
linux/drivers/media/video/cx18/cx18-io.h | 140 +++++++++++
linux/drivers/media/video/cx18/cx18-ioctl.c | 5
linux/drivers/media/video/cx18/cx18-irq.c | 43 +--
linux/drivers/media/video/cx18/cx18-mailbox.c | 46 ++-
linux/drivers/media/video/cx18/cx18-scb.c | 131 +++++------
linux/drivers/media/video/cx18/cx18-streams.c | 10
18 files changed, 576 insertions(+), 289 deletions(-)
<diff discarded since it is too big>
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/085961e0b1cc264d9e490c5b9fd8249df01ba44d
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
