summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/video/saa6588.c8
-rw-r--r--linux/drivers/media/video/saa6752hs.c8
-rw-r--r--linux/drivers/media/video/saa7134/saa6752hs.c8
-rw-r--r--linux/drivers/media/video/tveeprom.c13
-rw-r--r--linux/drivers/media/video/tvp5150.c10
-rw-r--r--v4l/ChangeLog11
6 files changed, 56 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa6588.c b/linux/drivers/media/video/saa6588.c
index 0ccfa5da0..2e69cb24c 100644
--- a/linux/drivers/media/video/saa6588.c
+++ b/linux/drivers/media/video/saa6588.c
@@ -395,7 +395,11 @@ static int saa6588_configure(struct saa6588 *s)
/* ---------------------------------------------------------------------- */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
+#else
+static int saa6588_attach(struct i2c_adapter *adap, int addr, unsigned short flags, int kind)
+#endif
{
struct saa6588 *s;
client_template.adapter = adap;
@@ -430,7 +434,9 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
s->timer.function = saa6588_timer;
s->timer.data = (unsigned long)s;
schedule_work(&s->work);
-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ MOD_INC_USE_COUNT;
+#endif
return 0;
}
diff --git a/linux/drivers/media/video/saa6752hs.c b/linux/drivers/media/video/saa6752hs.c
index fa3df17a4..819721c75 100644
--- a/linux/drivers/media/video/saa6752hs.c
+++ b/linux/drivers/media/video/saa6752hs.c
@@ -517,7 +517,11 @@ static int saa6752hs_init(struct i2c_client* client)
return 0;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
+#else
+static int saa6752hs_attach(struct i2c_adapter *adap, int addr, unsigned short flags, int kind)
+#endif
{
struct saa6752hs_state *h;
@@ -536,6 +540,10 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
i2c_set_clientdata(&h->client, h);
i2c_attach_client(&h->client);
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ MOD_INC_USE_COUNT;
+#endif
return 0;
}
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c
index fa3df17a4..819721c75 100644
--- a/linux/drivers/media/video/saa7134/saa6752hs.c
+++ b/linux/drivers/media/video/saa7134/saa6752hs.c
@@ -517,7 +517,11 @@ static int saa6752hs_init(struct i2c_client* client)
return 0;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
+#else
+static int saa6752hs_attach(struct i2c_adapter *adap, int addr, unsigned short flags, int kind)
+#endif
{
struct saa6752hs_state *h;
@@ -536,6 +540,10 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
i2c_set_clientdata(&h->client, h);
i2c_attach_client(&h->client);
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ MOD_INC_USE_COUNT;
+#endif
return 0;
}
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c
index e457e5745..581d40ce5 100644
--- a/linux/drivers/media/video/tveeprom.c
+++ b/linux/drivers/media/video/tveeprom.c
@@ -38,6 +38,7 @@
#include <linux/types.h>
#include <linux/videodev.h>
#include <linux/i2c.h>
+#include <linux/slab.h>
#include <media/tuner.h>
#include <media/tveeprom.h>
@@ -716,10 +717,18 @@ tveeprom_command(struct i2c_client *client,
return 0;
}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
static int
tveeprom_detect_client(struct i2c_adapter *adapter,
int address,
int kind)
+#else
+static int
+tveeprom_detect_client(struct i2c_adapter *adapter,
+ int address,
+ unsigned short flags,
+ int kind)
+#endif
{
struct i2c_client *client;
@@ -733,6 +742,10 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
client->flags = I2C_CLIENT_ALLOW_USE;
snprintf(client->name, sizeof(client->name), "tveeprom");
i2c_attach_client(client);
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ MOD_INC_USE_COUNT;
+#endif
return 0;
}
diff --git a/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c
index 235e1f700..8ae7ad2b9 100644
--- a/linux/drivers/media/video/tvp5150.c
+++ b/linux/drivers/media/video/tvp5150.c
@@ -9,6 +9,7 @@
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/delay.h>
+#include <linux/slab.h>
#include "compat.h"
#include <linux/videodev.h>
#include <linux/video_decoder.h>
@@ -763,8 +764,13 @@ static struct i2c_client client_template = {
.driver = &driver,
};
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
static int tvp5150_detect_client(struct i2c_adapter *adapter,
int address, int kind)
+#else
+static int tvp5150_detect_client(struct i2c_adapter *adapter,
+ int address, unsigned short flags, int kind)
+#endif
{
struct i2c_client *client;
struct tvp5150 *core;
@@ -815,7 +821,9 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
if (debug > 1)
dump_reg(client);
-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ MOD_INC_USE_COUNT;
+#endif
return 0;
}
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 621932758..19cf5e48b 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,14 @@
+2005-10-10 14:19 mchehab
+
+ * ../linux/drivers/media/video/saa6588.c: (saa6588_attach):
+ * ../linux/drivers/media/video/saa6752hs.c: (saa6752hs_attach):
+ * ../linux/drivers/media/video/tveeprom.c:
+ (tveeprom_detect_client):
+ * ../linux/drivers/media/video/tvp5150.c: (tvp5150_detect_client):
+ - Some compilation fixes for 2.4 kernel.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-10-10 09:30 mkrufky
* ../v4l/Makefile:
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-04 09:46:27 +0000