diff options
Diffstat (limited to 'linux/drivers/media/video/bt832.c')
| -rw-r--r-- | linux/drivers/media/video/bt832.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bt832.c b/linux/drivers/media/video/bt832.c index 30c0d3211..eec3cbfae 100644 --- a/linux/drivers/media/video/bt832.c +++ b/linux/drivers/media/video/bt832.c @@ -259,12 +259,18 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg) /* ----------------------------------------------------------------------- */ 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 bt832 driver", - .id = -1, /* FIXME */ +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) + .name = "bt832", .flags = I2C_DF_NOTIFY, +#else + .driver = { + .name = "bt832", + }, +#endif + .id = 0, /* FIXME */ .attach_adapter = bt832_probe, .detach_client = bt832_detach, .command = bt832_command, @@ -272,7 +278,9 @@ static struct i2c_driver driver = { static struct i2c_client client_template = { .name = "bt832", +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) .flags = I2C_CLIENT_ALLOW_USE, +#endif .driver = &driver, }; |