The patch number 8382 was added via Hans Verkuil <[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: Hans Verkuil <[EMAIL PROTECTED]>
mt9m001/saa7127: fix 2.6.25 kernel build warning/error.
Allow these to build for kernels < 2.6.26.
Signed-off-by: Hans Verkuil <[EMAIL PROTECTED]>
---
linux/drivers/media/video/mt9m001.c | 4 ++++
linux/drivers/media/video/saa7127.c | 5 ++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff -r c7b0f22f293b -r 6668e2f23c3a linux/drivers/media/video/mt9m001.c
--- a/linux/drivers/media/video/mt9m001.c Thu Jul 17 15:29:49 2008 +0200
+++ b/linux/drivers/media/video/mt9m001.c Thu Jul 17 15:37:03 2008 +0200
@@ -617,8 +617,12 @@ static void mt9m001_video_remove(struct
soc_camera_video_stop(&mt9m001->icd);
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
static int mt9m001_probe(struct i2c_client *client,
const struct i2c_device_id *did)
+#else
+static int mt9m001_probe(struct i2c_client *client)
+#endif
{
struct mt9m001 *mt9m001;
struct soc_camera_device *icd;
diff -r c7b0f22f293b -r 6668e2f23c3a linux/drivers/media/video/saa7127.c
--- a/linux/drivers/media/video/saa7127.c Thu Jul 17 15:29:49 2008 +0200
+++ b/linux/drivers/media/video/saa7127.c Thu Jul 17 15:37:03 2008 +0200
@@ -719,9 +719,12 @@ static int saa7127_probe(struct i2c_clie
saa7127_set_input_type(client, SAA7127_INPUT_TYPE_NORMAL);
saa7127_set_video_enable(client, 1);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
if (id->driver_data) { /* Chip type is already known */
state->ident = id->driver_data;
- } else { /* Needs detection */
+ } else /* Needs detection */
+#endif
+ {
int read_result;
/* Detect if it's an saa7129 */
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/6668e2f23c3ab46ea30b6d2769cd5faf5b7f5fca
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
