summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/tda9875.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/tda9875.c')
-rw-r--r--linux/drivers/media/video/tda9875.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tda9875.c b/linux/drivers/media/video/tda9875.c
index ddaaa2917..95665fb44 100644
--- a/linux/drivers/media/video/tda9875.c
+++ b/linux/drivers/media/video/tda9875.c
@@ -402,12 +402,18 @@ static int tda9875_command(struct i2c_client *client,
static struct i2c_driver driver = {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,54)
+#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)
.name = "i2c tda9875 driver",
- .id = I2C_DRIVERID_TDA9875,
.flags = I2C_DF_NOTIFY,
+#else
+ .driver = {
+ .name = "i2c tda9875 driver",
+ },
+#endif
+ .id = I2C_DRIVERID_TDA9875,
.attach_adapter = tda9875_probe,
.detach_client = tda9875_detach,
.command = tda9875_command,