summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/video/compat_ioctl32.c4
-rw-r--r--linux/drivers/media/video/cs53l32a.c3
-rw-r--r--linux/drivers/media/video/msp3400-driver.c4
-rw-r--r--linux/drivers/media/video/msp3400.c4
-rw-r--r--linux/drivers/media/video/saa7115.c3
-rw-r--r--linux/drivers/media/video/saa711x.c5
-rw-r--r--linux/drivers/media/video/saa7127.c3
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-oss.c14
-rw-r--r--linux/drivers/media/video/wm8775.c3
-rw-r--r--v4l/ChangeLog16
-rw-r--r--v4l/compat.h5
11 files changed, 58 insertions, 6 deletions
diff --git a/linux/drivers/media/video/compat_ioctl32.c b/linux/drivers/media/video/compat_ioctl32.c
index cfa1c44d5..467a6d44b 100644
--- a/linux/drivers/media/video/compat_ioctl32.c
+++ b/linux/drivers/media/video/compat_ioctl32.c
@@ -12,9 +12,10 @@
* ioctls.
*/
+#include "compat.h"
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,11)
#include <linux/config.h>
#include <linux/compat.h>
-#include "compat.h"
#include <linux/videodev.h>
#include <linux/videodev2.h>
#include <linux/module.h>
@@ -731,3 +732,4 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
EXPORT_SYMBOL_GPL(v4l_compat_ioctl32);
MODULE_LICENSE("GPL");
+#endif
diff --git a/linux/drivers/media/video/cs53l32a.c b/linux/drivers/media/video/cs53l32a.c
index e43986b74..2d3ee491e 100644
--- a/linux/drivers/media/video/cs53l32a.c
+++ b/linux/drivers/media/video/cs53l32a.c
@@ -29,6 +29,9 @@
#include <linux/i2c-id.h>
#include <linux/videodev.h>
#include <media/audiochip.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#endif
MODULE_DESCRIPTION("i2c device driver for cs53l32a Audio ADC");
MODULE_AUTHOR("Martin Vaughan");
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 4eabc2ef8..ff49d022f 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -2456,9 +2456,11 @@ static int msp_detach(struct i2c_client *client)
/* shutdown control thread */
if (msp->kthread) {
- msp->restart = 1;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
DECLARE_MUTEX_LOCKED(sem);
+#endif
+ msp->restart = 1;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
/* shutdown control thread */
msp->notify = &sem;
msp->rmmod = 1;
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 4eabc2ef8..ff49d022f 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -2456,9 +2456,11 @@ static int msp_detach(struct i2c_client *client)
/* shutdown control thread */
if (msp->kthread) {
- msp->restart = 1;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
DECLARE_MUTEX_LOCKED(sem);
+#endif
+ msp->restart = 1;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
/* shutdown control thread */
msp->notify = &sem;
msp->rmmod = 1;
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c
index 434e33def..74b105fc9 100644
--- a/linux/drivers/media/video/saa7115.c
+++ b/linux/drivers/media/video/saa7115.c
@@ -40,6 +40,9 @@
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#endif
MODULE_DESCRIPTION("Philips SAA7114/SAA7115 video decoder driver");
MODULE_AUTHOR("Maxim Yevtyushkin, Kevin Thayer, Chris Kennedy, Hans Verkuil");
diff --git a/linux/drivers/media/video/saa711x.c b/linux/drivers/media/video/saa711x.c
index aeca5bdbd..0ba7c6fd9 100644
--- a/linux/drivers/media/video/saa711x.c
+++ b/linux/drivers/media/video/saa711x.c
@@ -47,6 +47,9 @@ MODULE_LICENSE("GPL");
#include <linux/i2c.h>
#include <linux/i2c-dev.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#endif
#define I2C_NAME(s) (s)->name
@@ -578,7 +581,9 @@ saa711x_detach_client (struct i2c_client *client)
/* ----------------------------------------------------------------------- */
static struct i2c_driver i2c_driver_saa711x = {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
.owner = THIS_MODULE,
+#endif
.name = "saa711x",
.id = I2C_DRIVERID_SAA711X,
diff --git a/linux/drivers/media/video/saa7127.c b/linux/drivers/media/video/saa7127.c
index 0dcc4948b..b672c60d7 100644
--- a/linux/drivers/media/video/saa7127.c
+++ b/linux/drivers/media/video/saa7127.c
@@ -55,6 +55,9 @@
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#endif
static int debug = 0;
static int test_image = 0;
diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c
index beab9a86a..a2df1dff7 100644
--- a/linux/drivers/media/video/saa7134/saa7134-oss.c
+++ b/linux/drivers/media/video/saa7134/saa7134-oss.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-oss.c,v 1.30 2005/12/07 12:30:28 mchehab Exp $
+ * $Id: saa7134-oss.c,v 1.31 2005/12/10 01:43:26 mchehab Exp $
*
* device driver for philips saa7134 based TV cards
* oss dsp interface
@@ -50,8 +50,12 @@ MODULE_PARM_DESC(rate,"sample rate (valid are: 32000,48000)");
static unsigned int dsp_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
MODULE_PARM_DESC(dsp_nr, "device numbers for SAA7134 capture interface(s).");
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+MODULE_PARM(dsp_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i");
+#else
static int dummy;
module_param_array(dsp_nr, int, dummy, 0444);
+#endif
#else
module_param_array(dsp_nr, int, NULL, 0444);
#endif
@@ -59,7 +63,11 @@ module_param_array(dsp_nr, int, NULL, 0444);
static unsigned int mixer_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
MODULE_PARM_DESC(mixer_nr, "mixer numbers for SAA7134 capture interface(s).");
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+MODULE_PARM(mixer_nr,"1-" __stringify(SAA7134_MAXBOARDS) "i");
+#else
module_param_array(mixer_nr, int, dummy, 0444);
+#endif
#else
module_param_array(mixer_nr, int, NULL, 0444);
#endif
@@ -957,7 +965,11 @@ static int oss_device_exit(struct saa7134_dev *dev)
saa7134_oss_fini(dev);
if (dev->pci->irq > 0) {
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,0)
synchronize_irq(dev->pci->irq);
+#else
+ synchronize_irq();
+#endif
free_irq(dev->pci->irq,&dev->dmasound);
}
diff --git a/linux/drivers/media/video/wm8775.c b/linux/drivers/media/video/wm8775.c
index 0156d6fc7..6a2c41567 100644
--- a/linux/drivers/media/video/wm8775.c
+++ b/linux/drivers/media/video/wm8775.c
@@ -34,6 +34,9 @@
#include <linux/i2c-id.h>
#include <linux/videodev.h>
#include <media/audiochip.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+#include <media/i2c-compat.h>
+#endif
MODULE_DESCRIPTION("wm8775 driver");
MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index a0132614d..810b0014f 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,19 @@
+2005-12-10 01:39 mchehab
+
+ * linux/drivers/media/video/compat_ioctl32.c:
+ * linux/drivers/media/video/cs53l32a.c:
+ * linux/drivers/media/video/msp3400.c:
+ * linux/drivers/media/video/saa7115.c:
+ * linux/drivers/media/video/saa711x.c:
+ * linux/drivers/media/video/saa7127.c:
+ * linux/drivers/media/video/saa7134/saa7134-oss.c:
+ (oss_device_exit):
+ * linux/drivers/media/video/wm8775.c:
+ * v4l/compat.h:
+ - make it compile against kernel 2.4.32
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-12-09 21:36 woods
* linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c:
diff --git a/v4l/compat.h b/v4l/compat.h
index 85f179da3..67fc48824 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1,5 +1,5 @@
/*
- * $Id: compat.h,v 1.41 2005/12/08 16:06:52 mkrufky Exp $
+ * $Id: compat.h,v 1.42 2005/12/10 01:43:26 mchehab Exp $
*/
#ifndef _COMPAT_H
@@ -10,7 +10,6 @@
#include <linux/version.h>
#include <linux/utsname.h>
#include <linux/sched.h>
-#include <linux/device.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)
# define minor(x) MINOR(x)
@@ -21,6 +20,8 @@
# define need_resched() (current->need_resched)
#define work_struct tq_struct
+#else
+#include <linux/device.h>
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-04 11:14:20 +0000