The patch number 11102 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:
Linux Media Mailing List <[email protected]>
------
From: Mauro Carvalho Chehab <[email protected]>
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/dvb/frontends/au8522_decoder.c | 6 ++++--
linux/drivers/media/video/au0828/au0828-video.c | 1 +
linux/drivers/media/video/mt9v022.c | 4 ++++
linux/drivers/media/video/v4l2-common.c | 8 ++++----
4 files changed, 13 insertions(+), 6 deletions(-)
diff -r fe013ed74cc0 -r 9482b8a0e7be
linux/drivers/media/dvb/frontends/au8522_decoder.c
--- a/linux/drivers/media/dvb/frontends/au8522_decoder.c Thu Mar 19
00:57:04 2009 +0100
+++ b/linux/drivers/media/dvb/frontends/au8522_decoder.c Thu Mar 19
08:07:53 2009 -0300
@@ -48,14 +48,16 @@ MODULE_LICENSE("GPL");
static int au8522_analog_debug;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
static unsigned short normal_i2c[] = { 0x8e >> 1, I2C_CLIENT_END };
+
+I2C_CLIENT_INSMOD;
+#endif
module_param_named(analog_debug, au8522_analog_debug, int, 0644);
MODULE_PARM_DESC(analog_debug,
"Analog debugging messages [0=Off (default) 1=On]");
-
-I2C_CLIENT_INSMOD;
struct au8522_register_config {
u16 reg_name;
diff -r fe013ed74cc0 -r 9482b8a0e7be
linux/drivers/media/video/au0828/au0828-video.c
--- a/linux/drivers/media/video/au0828/au0828-video.c Thu Mar 19 00:57:04
2009 +0100
+++ b/linux/drivers/media/video/au0828/au0828-video.c Thu Mar 19 08:07:53
2009 -0300
@@ -33,6 +33,7 @@
#include <linux/device.h>
#include <linux/suspend.h>
#include <linux/version.h>
+#include <linux/mm.h>
#include <media/v4l2-common.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-chip-ident.h>
diff -r fe013ed74cc0 -r 9482b8a0e7be linux/drivers/media/video/mt9v022.c
--- a/linux/drivers/media/video/mt9v022.c Thu Mar 19 00:57:04 2009 +0100
+++ b/linux/drivers/media/video/mt9v022.c Thu Mar 19 08:07:53 2009 -0300
@@ -741,8 +741,12 @@ static void mt9v022_video_remove(struct
soc_camera_video_stop(icd);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
static int mt9v022_probe(struct i2c_client *client,
const struct i2c_device_id *did)
+#else
+static int mt9v022_probe(struct i2c_client *client)
+#endif
{
struct mt9v022 *mt9v022;
struct soc_camera_device *icd;
diff -r fe013ed74cc0 -r 9482b8a0e7be linux/drivers/media/video/v4l2-common.c
--- a/linux/drivers/media/video/v4l2-common.c Thu Mar 19 00:57:04 2009 +0100
+++ b/linux/drivers/media/video/v4l2-common.c Thu Mar 19 08:07:53 2009 -0300
@@ -829,10 +829,10 @@ struct v4l2_subdev *v4l2_i2c_new_subdev(
#endif
BUG_ON(!dev);
-#ifdef MODULE
+
if (module_name)
request_module(module_name);
-#endif
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
/* Setup the i2c board info with the device type and
the device address. */
@@ -897,10 +897,10 @@ struct v4l2_subdev *v4l2_i2c_new_probed_
#endif
BUG_ON(!dev);
-#ifdef MODULE
+
if (module_name)
request_module(module_name);
-#endif
+
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
/* Setup the i2c board info with the device type and
the device address. */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/9482b8a0e7be0558523cf6d88b4cfedcca623c79
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
