diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 16:15:43 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-05 16:15:43 -0200 |
| commit | f908968983a448cba404613e0564a7097b63558f (patch) | |
| tree | 31f33203850a0c4fcde070ee5e0795880ca7c8fd /linux/drivers/media/video/ov772x.c | |
| parent | 94703235501e112e7496efe5bce32671e121d98f (diff) | |
| parent | 0cb9746f402b6eb2d3220ae59b522cddf4db9bcd (diff) | |
| download | mediapointer-dvb-s2-f908968983a448cba404613e0564a7097b63558f.tar.gz mediapointer-dvb-s2-f908968983a448cba404613e0564a7097b63558f.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/ov772x.c')
| -rw-r--r-- | linux/drivers/media/video/ov772x.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/linux/drivers/media/video/ov772x.c b/linux/drivers/media/video/ov772x.c index 6206dff8d..2ddc2ab70 100644 --- a/linux/drivers/media/video/ov772x.c +++ b/linux/drivers/media/video/ov772x.c @@ -874,9 +874,12 @@ static struct soc_camera_ops ov772x_ops = { * i2c_driver function */ -static int ov772x_probe(struct i2c_client *client, - const struct i2c_device_id *did) - +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) +static int ov772x_probe(struct i2c_client *client) +#else +static int ov772x_probe(struct i2c_client *client, + const struct i2c_device_id *did) +#endif { struct ov772x_priv *priv; struct ov772x_camera_info *info; @@ -927,12 +930,13 @@ static int ov772x_remove(struct i2c_client *client) return 0; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) static const struct i2c_device_id ov772x_id[] = { {"ov772x", 0}, { } }; MODULE_DEVICE_TABLE(i2c, ov772x_id); - +#endif static struct i2c_driver ov772x_i2c_driver = { .driver = { @@ -940,7 +944,9 @@ static struct i2c_driver ov772x_i2c_driver = { }, .probe = ov772x_probe, .remove = ov772x_remove, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) .id_table = ov772x_id, +#endif }; /* |