summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tvp5150.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-08 00:19:19 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2008-07-08 00:19:19 +0200
commit7ce87336c2f386ab6c35e985a5832d21b5cd7fab (patch)
tree13562d693161dbaef976462e0f777fd49f4f8bf1 /linux/drivers/media/video/tvp5150.c
parent64a2df85368a26eafb15272ae2ba0fc556fbae21 (diff)
downloadmediapointer-dvb-s2-7ce87336c2f386ab6c35e985a5832d21b5cd7fab.tar.gz
mediapointer-dvb-s2-7ce87336c2f386ab6c35e985a5832d21b5cd7fab.tar.bz2
v4l-dvb: remove support for kernels < 2.6.0
From: Hans Verkuil <hverkuil@xs4all.nl> First phase of the backwards compatibility cleanup: stop supporting kernels older than 2.6.0. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/tvp5150.c')
-rw-r--r--linux/drivers/media/video/tvp5150.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/linux/drivers/media/video/tvp5150.c b/linux/drivers/media/video/tvp5150.c
index 7dc6623cc..bb88eb5c0 100644
--- a/linux/drivers/media/video/tvp5150.c
+++ b/linux/drivers/media/video/tvp5150.c
@@ -12,12 +12,6 @@
#include <linux/video_decoder.h>
#include <media/v4l2-common.h>
#include <media/tvp5150.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <linux/module.h>
-#include <linux/delay.h>
-#include <linux/slab.h>
-#include "i2c-compat.h"
-#endif
#include "tvp5150_reg.h"
@@ -1148,13 +1142,8 @@ 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 *c;
struct tvp5150 *core;
@@ -1204,9 +1193,6 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
if (debug > 1)
dump_reg(c);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- MOD_INC_USE_COUNT;
-#endif
return 0;
}
@@ -1242,7 +1228,7 @@ static int tvp5150_detach_client(struct i2c_client *c)
/* ----------------------------------------------------------------------- */
static struct i2c_driver driver = {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15))
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
.owner = THIS_MODULE,
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)