diff options
Diffstat (limited to 'linux/drivers/media/video/tw9910.c')
| -rw-r--r-- | linux/drivers/media/video/tw9910.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/drivers/media/video/tw9910.c b/linux/drivers/media/video/tw9910.c index 52c0357fa..c670b23a1 100644 --- a/linux/drivers/media/video/tw9910.c +++ b/linux/drivers/media/video/tw9910.c @@ -837,8 +837,12 @@ static struct soc_camera_ops tw9910_ops = { * i2c_driver function */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) +static int tw9910_probe(struct i2c_client *client) +#else static int tw9910_probe(struct i2c_client *client, const struct i2c_device_id *did) +#endif { struct tw9910_priv *priv; @@ -915,19 +919,23 @@ static int tw9910_remove(struct i2c_client *client) return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) static const struct i2c_device_id tw9910_id[] = { { "tw9910", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, tw9910_id); +#endif static struct i2c_driver tw9910_i2c_driver = { .driver = { .name = "tw9910", }, .probe = tw9910_probe, .remove = tw9910_remove, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) .id_table = tw9910_id, +#endif }; /* |