diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-09 22:42:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-09 22:42:07 -0300 |
| commit | 06baaa0441c7fec2a211ddf7c502f837cd988132 (patch) | |
| tree | 284236ae49b1385a091119cf7b3520bc7d64552a /linux/drivers/media/video/tcm825x.c | |
| parent | e5561cf14fe189f7f0d726a1c66ffa992354ab2d (diff) | |
| parent | d784aba6717da44bfef18007146f6d00280e39fe (diff) | |
| download | mediapointer-dvb-s2-06baaa0441c7fec2a211ddf7c502f837cd988132.tar.gz mediapointer-dvb-s2-06baaa0441c7fec2a211ddf7c502f837cd988132.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/fusionhdtv7
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 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/linux/drivers/media/video/tcm825x.c b/linux/drivers/media/video/tcm825x.c index 216638e00..2f823f27a 100644 --- a/linux/drivers/media/video/tcm825x.c +++ b/linux/drivers/media/video/tcm825x.c @@ -846,8 +846,12 @@ static struct v4l2_int_device tcm825x_int_device = { }, }; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) +static int tcm825x_probe(struct i2c_client *client) +#else static int tcm825x_probe(struct i2c_client *client, const struct i2c_device_id *did) +#endif { struct tcm825x_sensor *sensor = &tcm825x; int rval; @@ -891,12 +895,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 = { |