diff options
Diffstat (limited to 'linux/drivers/media/video/saa6588.c')
| -rw-r--r-- | linux/drivers/media/video/saa6588.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa6588.c b/linux/drivers/media/video/saa6588.c index a775c89e0..294078e92 100644 --- a/linux/drivers/media/video/saa6588.c +++ b/linux/drivers/media/video/saa6588.c @@ -511,12 +511,18 @@ static int saa6588_command(struct i2c_client *client, unsigned int cmd, /* ----------------------------------------------------------------------- */ 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 - .name = "i2c saa6588 driver", - .id = -1, /* FIXME */ +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) + .name = "saa6588", .flags = I2C_DF_NOTIFY, +#else + .driver = { + .name = "saa6588", + }, +#endif + .id = -1, /* FIXME */ .attach_adapter = saa6588_probe, .detach_client = saa6588_detach, .command = saa6588_command, @@ -524,7 +530,9 @@ static struct i2c_driver driver = { static struct i2c_client client_template = { .name = "saa6588", +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) .flags = I2C_CLIENT_ALLOW_USE, +#endif .driver = &driver, }; |