diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-30 21:58:17 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-12-30 21:58:17 +0100 |
| commit | 1ca1203a1eab7dc3951e569975bbbccc76aeb8fe (patch) | |
| tree | 01ebfe8e3873a2bb62ce33fb2e2e125ce7fc966a /linux | |
| parent | 3f85abb813f1ad7454fb7a2f8e2998373571fe39 (diff) | |
| download | mediapointer-dvb-s2-1ca1203a1eab7dc3951e569975bbbccc76aeb8fe.tar.gz mediapointer-dvb-s2-1ca1203a1eab7dc3951e569975bbbccc76aeb8fe.tar.bz2 | |
v4l: fix compile errors for older kernels
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/af9013.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/mt9t031.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/tw9910.c | 8 |
3 files changed, 17 insertions, 0 deletions
diff --git a/linux/drivers/media/dvb/frontends/af9013.c b/linux/drivers/media/dvb/frontends/af9013.c index b2b50fb4c..937715a96 100644 --- a/linux/drivers/media/dvb/frontends/af9013.c +++ b/linux/drivers/media/dvb/frontends/af9013.c @@ -33,6 +33,7 @@ #include "dvb_frontend.h" #include "af9013_priv.h" #include "af9013.h" +#include "compat.h" int af9013_debug; diff --git a/linux/drivers/media/video/mt9t031.c b/linux/drivers/media/video/mt9t031.c index 349d8e365..dd5bd9dd0 100644 --- a/linux/drivers/media/video/mt9t031.c +++ b/linux/drivers/media/video/mt9t031.c @@ -632,8 +632,12 @@ static void mt9t031_video_remove(struct soc_camera_device *icd) soc_camera_video_stop(icd); } +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) +static int mt9t031_probe(struct i2c_client *client) +#else static int mt9t031_probe(struct i2c_client *client, const struct i2c_device_id *did) +#endif { struct mt9t031 *mt9t031; struct soc_camera_device *icd; @@ -703,19 +707,23 @@ static int mt9t031_remove(struct i2c_client *client) return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) static const struct i2c_device_id mt9t031_id[] = { { "mt9t031", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, mt9t031_id); +#endif static struct i2c_driver mt9t031_i2c_driver = { .driver = { .name = "mt9t031", }, .probe = mt9t031_probe, .remove = mt9t031_remove, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) .id_table = mt9t031_id, +#endif }; static int __init mt9t031_mod_init(void) diff --git a/linux/drivers/media/video/tw9910.c b/linux/drivers/media/video/tw9910.c index 52c0357fa..c670b23a1 100644 --- a/linux/drivers/media/video/tw9910.c +++ b/linux/drivers/media/video/tw9910.c @@ -837,8 +837,12 @@ static struct soc_camera_ops tw9910_ops = { * i2c_driver function */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) +static int tw9910_probe(struct i2c_client *client) +#else static int tw9910_probe(struct i2c_client *client, const struct i2c_device_id *did) +#endif { struct tw9910_priv *priv; @@ -915,19 +919,23 @@ static int tw9910_remove(struct i2c_client *client) return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) static const struct i2c_device_id tw9910_id[] = { { "tw9910", 0 }, { } }; MODULE_DEVICE_TABLE(i2c, tw9910_id); +#endif static struct i2c_driver tw9910_i2c_driver = { .driver = { .name = "tw9910", }, .probe = tw9910_probe, .remove = tw9910_remove, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) .id_table = tw9910_id, +#endif }; /* |