diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-15 08:25:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-15 08:25:02 -0300 |
| commit | e192b6f88d8065aacfce581bee2f3a231156e8be (patch) | |
| tree | e987468be1c649162e0a10059900a682bb62824e /linux/drivers/media/video/mt9m001.c | |
| parent | 905787833253b4eaa26ebe72826447c814d339d8 (diff) | |
| parent | 983506b534a01a91cadea8fd8369d6f00538cd0c (diff) | |
| download | mediapointer-dvb-s2-e192b6f88d8065aacfce581bee2f3a231156e8be.tar.gz mediapointer-dvb-s2-e192b6f88d8065aacfce581bee2f3a231156e8be.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/anysee/
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/mt9m001.c')
| -rw-r--r-- | linux/drivers/media/video/mt9m001.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/mt9m001.c b/linux/drivers/media/video/mt9m001.c index ee4349954..089ce311f 100644 --- a/linux/drivers/media/video/mt9m001.c +++ b/linux/drivers/media/video/mt9m001.c @@ -694,11 +694,13 @@ static int mt9m001_remove(struct i2c_client *client) return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) static const struct i2c_device_id mt9m001_id[] = { { "mt9m001", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, mt9m001_id); +#endif static struct i2c_driver mt9m001_i2c_driver = { .driver = { @@ -706,7 +708,9 @@ static struct i2c_driver mt9m001_i2c_driver = { }, .probe = mt9m001_probe, .remove = mt9m001_remove, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) .id_table = mt9m001_id, +#endif }; static int __init mt9m001_mod_init(void) |