summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tda9840.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/tda9840.c')
-rw-r--r--linux/drivers/media/video/tda9840.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/linux/drivers/media/video/tda9840.c b/linux/drivers/media/video/tda9840.c
index c41e50ba6..537a06492 100644
--- a/linux/drivers/media/video/tda9840.c
+++ b/linux/drivers/media/video/tda9840.c
@@ -51,9 +51,6 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
/* addresses to scan, found only at 0x42 (7-Bit) */
static unsigned short normal_i2c[] = { I2C_ADDR_TDA9840, I2C_CLIENT_END };
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
-static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
-#endif
/* magic definition of all other variables and things */
I2C_CLIENT_INSMOD;
@@ -231,10 +228,8 @@ static int detach(struct i2c_client *client)
}
static struct i2c_driver driver = {
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) &&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15))
- .owner = THIS_MODULE,
-#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
+ .owner = THIS_MODULE,
.name = "tda9840",
.flags = I2C_DF_NOTIFY,
#else