diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-22 21:50:59 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-08-22 21:50:59 +0200 |
| commit | 5ccd3bef0a3b936847eb1cdf0d7e496022b560c2 (patch) | |
| tree | 049ca0ca3f371cd7327dda2931412b7a3e040594 /linux/drivers/media/video/mt9m111.c | |
| parent | 82e3269e7afdf7d14b85b98871b0c771ba006cbb (diff) | |
| download | mediapointer-dvb-s2-5ccd3bef0a3b936847eb1cdf0d7e496022b560c2.tar.gz mediapointer-dvb-s2-5ccd3bef0a3b936847eb1cdf0d7e496022b560c2.tar.bz2 | |
mt9m111: fix compile error and warning when compiling for kernel 2.6.25.
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/mt9m111.c')
| -rw-r--r-- | linux/drivers/media/video/mt9m111.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/linux/drivers/media/video/mt9m111.c b/linux/drivers/media/video/mt9m111.c index 4844486d7..e4ec7538d 100644 --- a/linux/drivers/media/video/mt9m111.c +++ b/linux/drivers/media/video/mt9m111.c @@ -879,8 +879,12 @@ static void mt9m111_video_remove(struct soc_camera_device *icd) soc_camera_video_stop(&mt9m111->icd); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) +static int mt9m111_probe(struct i2c_client *client) +#else static int mt9m111_probe(struct i2c_client *client, const struct i2c_device_id *did) +#endif { struct mt9m111 *mt9m111; struct soc_camera_device *icd; @@ -940,11 +944,13 @@ static int mt9m111_remove(struct i2c_client *client) return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) static const struct i2c_device_id mt9m111_id[] = { { "mt9m111", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, mt9m111_id); +#endif static struct i2c_driver mt9m111_i2c_driver = { .driver = { @@ -952,7 +958,9 @@ static struct i2c_driver mt9m111_i2c_driver = { }, .probe = mt9m111_probe, .remove = mt9m111_remove, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) .id_table = mt9m111_id, +#endif }; static int __init mt9m111_mod_init(void) |