diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-05 10:24:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-05 10:24:54 -0300 |
| commit | f46a3bb02f6dbc621fcbb41bf346ef37d5cc4502 (patch) | |
| tree | bb4b0aa5e201bf8bc73be68df98a9d78367ab1f1 /linux/drivers/media/video/tcm825x.c | |
| parent | 7339e3ef64dd5b2f08b23d60447ea48cb52108e5 (diff) | |
| parent | 2a79e6ad21afbacd47657490937dfae88775f6f1 (diff) | |
| download | mediapointer-dvb-s2-f46a3bb02f6dbc621fcbb41bf346ef37d5cc4502.tar.gz mediapointer-dvb-s2-f46a3bb02f6dbc621fcbb41bf346ef37d5cc4502.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/bug-fix
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/tcm825x.c')
| -rw-r--r-- | linux/drivers/media/video/tcm825x.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/linux/drivers/media/video/tcm825x.c b/linux/drivers/media/video/tcm825x.c index 216638e00..08c7888e5 100644 --- a/linux/drivers/media/video/tcm825x.c +++ b/linux/drivers/media/video/tcm825x.c @@ -891,12 +891,23 @@ static int __exit tcm825x_remove(struct i2c_client *client) return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) +static const struct i2c_device_id tcm825x_id[] = { + { "tcm825x", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, tcm825x_id); +#endif + static struct i2c_driver tcm825x_i2c_driver = { .driver = { .name = TCM825X_NAME, }, .probe = tcm825x_probe, .remove = __exit_p(tcm825x_remove), +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) + .id_table = tcm825x_id, +#endif }; static struct tcm825x_sensor tcm825x = { |