summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tvp5150.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-10-10 14:27:18 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-10-10 14:27:18 +0000
commit84318349cd1584a035e84b05c44bfee022d2f837 (patch)
tree5c0adc6f8325c91fd381c337bd87d636b3f6ca93 /linux/drivers/media/video/tvp5150.c
parentea710d504d50292203ba496ef4c663ebc46b6986 (diff)
downloadmediapointer-dvb-s2-84318349cd1584a035e84b05c44bfee022d2f837.tar.gz
mediapointer-dvb-s2-84318349cd1584a035e84b05c44bfee022d2f837.tar.bz2
- Some compilation fixes for 2.4 kernel.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/tvp5150.c')
-rw-r--r--linux/drivers/media/video/tvp5150.c10
1 files changed, 9 insertions, 1 deletions
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;
}