Makes v4l compile under 2.4 kernels

From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
kernel-sync

- Makes V4L compile with kernel 2.4
- em28xx doesn't compile with 2.4 kernels. Additional work is
  necessary to make it compile.

Thanks-to: Stefan Leichter <Stefan.Leichter@camLine.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>

10 files changed, 39 insertions, 5 deletions

diff --git a/linux/drivers/media/video/cs53l32a.c b/linux/drivers/media/video/cs53l32a.c
index 2d3ee491e..1e5cf79d6 100644
--- a/linux/drivers/media/video/cs53l32a.c
+++ b/linux/drivers/media/video/cs53l32a.c
@@ -31,6 +31,7 @@
 #include <media/audiochip.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #include <media/i2c-compat.h>
+#include <linux/slab.h>
 #endif
 
 MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");
diff --git a/linux/drivers/media/video/cx25840/cx25840-audio.c b/linux/drivers/media/video/cx25840/cx25840-audio.c
index 448305874..51b00e593 100644
--- a/linux/drivers/media/video/cx25840/cx25840-audio.c
+++ b/linux/drivers/media/video/cx25840/cx25840-audio.c
@@ -21,6 +21,9 @@
 #include <linux/i2c.h>
 #include <media/audiochip.h>
 #include <media/v4l2-common.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#endif
 
 #include "cx25840.h"
 
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c
index 517a702bd..cfa9cca9f 100644
--- a/linux/drivers/media/video/cx25840/cx25840-core.c
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c
@@ -34,6 +34,9 @@
 #include <linux/i2c.h>
 #include <media/audiochip.h>
 #include <media/v4l2-common.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#endif
 
 #include "cx25840.h"
 
diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c
index 72b004f96..a40d1bcd0 100644
--- a/linux/drivers/media/video/cx88/cx88-mpeg.c
+++ b/linux/drivers/media/video/cx88/cx88-mpeg.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cx88-mpeg.c,v 1.41 2005/11/13 18:11:21 mkrufky Exp $
+ * $Id: cx88-mpeg.c,v 1.42 2005/12/11 18:11:56 mchehab Exp $
  *
  *  Support for the mpeg transport stream transfers
  *  PCI function #2 of the cx2388x.
@@ -26,19 +26,25 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include "compat.h"
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
 #include <linux/device.h>
+#endif
 #include <linux/interrupt.h>
 #include <asm/delay.h>
 
-#include "compat.h"
 #include "cx88.h"
 
 /* ------------------------------------------------------------------ */
 
 MODULE_DESCRIPTION("mpeg driver for cx2388x based TV cards");
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
 MODULE_AUTHOR("Jelle Foks <jelle@foks.8m.com>");
 MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
+#else
+MODULE_AUTHOR("Jelle Foks <jelle@foks.8m.com>,Chris Pascoe <c.pascoe@itee.uq.edu.au>,Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
+#endif
 MODULE_LICENSE("GPL");
 
 static unsigned int debug = 0;
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index bdfa47898..3194f64c0 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -33,6 +33,10 @@
 #include "em28xx.h"
 #include <media/tuner.h>
 #include <media/v4l2-common.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#include <linux/moduleparam.h>
+#endif
 
 #define DRIVER_AUTHOR "Ludovico Cavedon <cavedon@sssup.it>, " \
 		      "Markus Rechberger <mrechberger@gmail.com>, " \
diff --git a/linux/drivers/media/video/mt20xx.c b/linux/drivers/media/video/mt20xx.c
index 533baaaa6..956af1dd4 100644
--- a/linux/drivers/media/video/mt20xx.c
+++ b/linux/drivers/media/video/mt20xx.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mt20xx.c,v 1.10 2005/12/04 12:21:15 hverkuil Exp $
+ * $Id: mt20xx.c,v 1.11 2005/12/11 18:11:56 mchehab Exp $
  *
  * i2c tv tuner chip device driver
  * controls microtune tuners, mt2032 + mt2050 at the moment.
@@ -10,6 +10,9 @@
 #include <linux/videodev.h>
 #include <linux/moduleparam.h>
 #include <media/tuner.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#endif
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/linux/drivers/media/video/saa711x.c b/linux/drivers/media/video/saa711x.c
index 0ba7c6fd9..ca27ae3d8 100644
--- a/linux/drivers/media/video/saa711x.c
+++ b/linux/drivers/media/video/saa711x.c
@@ -478,10 +478,17 @@ static int saa711x_i2c_id = 0;
 
 static struct i2c_driver i2c_driver_saa711x;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 static int
 saa711x_detect_client (struct i2c_adapter *adapter,
 		       int                 address,
 		       int                 kind)
+#else
+static int
+saa711x_detect_client (struct i2c_adapter *adapter,
+			int address,
+			unsigned short flags, int kind)
+#endif
 {
 	int i;
 	struct i2c_client *client;
diff --git a/linux/drivers/media/video/tda8290.c b/linux/drivers/media/video/tda8290.c
index 80538b4d2..5f138d934 100644
--- a/linux/drivers/media/video/tda8290.c
+++ b/linux/drivers/media/video/tda8290.c
@@ -1,5 +1,5 @@
 /*
-   $Id: tda8290.c,v 1.30 2005/11/16 20:00:59 mchehab Exp $
+   $Id: tda8290.c,v 1.31 2005/12/11 18:11:56 mchehab Exp $
 
    i2c tv tuner chip device driver
    controls the philips tda8290+75 tuner chip combo.
@@ -24,6 +24,9 @@
 #include <linux/videodev.h>
 #include <linux/delay.h>
 #include <media/tuner.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#endif
 
 /* ---------------------------------------------------------------------- */
 
diff --git a/linux/drivers/media/video/tea5767.c b/linux/drivers/media/video/tea5767.c
index 759b68d8c..c9a66b6df 100644
--- a/linux/drivers/media/video/tea5767.c
+++ b/linux/drivers/media/video/tea5767.c
@@ -2,7 +2,7 @@
  * For Philips TEA5767 FM Chip used on some TV Cards like Prolink Pixelview
  * I2C address is allways 0xC0.
  *
- * $Id: tea5767.c,v 1.30 2005/10/16 12:13:58 mchehab Exp $
+ * $Id: tea5767.c,v 1.31 2005/12/11 18:11:56 mchehab Exp $
  *
  * Copyright (c) 2005 Mauro Carvalho Chehab (mchehab@brturbo.com.br)
  * This code is placed under the terms of the GNU General Public License
@@ -16,6 +16,9 @@
 #include <linux/videodev.h>
 #include <linux/delay.h>
 #include <media/tuner.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#endif
 
 #define PREFIX "TEA5767 "
 
diff --git a/linux/drivers/media/video/wm8775.c b/linux/drivers/media/video/wm8775.c
index 6a2c41567..527ea7d0f 100644
--- a/linux/drivers/media/video/wm8775.c
+++ b/linux/drivers/media/video/wm8775.c
@@ -36,6 +36,7 @@
 #include <media/audiochip.h>
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
 #include <media/i2c-compat.h>
+#include <linux/slab.h>
 #endif
 
 MODULE_DESCRIPTION("wm8775 driver");