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/upd64031a.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/upd64031a.c')
| -rw-r--r-- | linux/drivers/media/video/upd64031a.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/linux/drivers/media/video/upd64031a.c b/linux/drivers/media/video/upd64031a.c index 5408309cb..c59944d72 100644 --- a/linux/drivers/media/video/upd64031a.c +++ b/linux/drivers/media/video/upd64031a.c @@ -241,15 +241,25 @@ static int upd64031a_remove(struct i2c_client *client) } /* ----------------------------------------------------------------------- */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) EXPORT_NO_SYMBOLS; #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) +static const struct i2c_device_id upd64031a_id[] = { + { "upd64031a", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, upd64031a_id); +#endif + static struct v4l2_i2c_driver_data v4l2_i2c_data = { .name = "upd64031a", .driverid = I2C_DRIVERID_UPD64031A, .command = upd64031a_command, .probe = upd64031a_probe, .remove = upd64031a_remove, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) + .id_table = upd64031a_id, +#endif }; |