diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-15 22:08:09 +0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 07:05:58 +0400 |
commit | ef2ac770cd69909f6387d8a9e045cb41b46aedcf (patch) | |
tree | acdb5432796c6b34d51fd6532aab4059470ba51e /drivers/media/video/ov7670.c | |
parent | cb595b516030bb0c356386e6c8de8569f1966e5b (diff) | |
download | linux-ef2ac770cd69909f6387d8a9e045cb41b46aedcf.tar.xz |
V4L/DVB: ov7670: remove obsolete v4l2-i2c-drv.h header
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ov7670.c')
-rw-r--r-- | drivers/media/video/ov7670.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c index c141d2e604e3..089013ec987a 100644 --- a/drivers/media/video/ov7670.c +++ b/drivers/media/video/ov7670.c @@ -19,7 +19,6 @@ #include <media/v4l2-device.h> #include <media/v4l2-chip-ident.h> #include <media/v4l2-mediabus.h> -#include <media/v4l2-i2c-drv.h> MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>"); @@ -1496,9 +1495,25 @@ static const struct i2c_device_id ov7670_id[] = { }; MODULE_DEVICE_TABLE(i2c, ov7670_id); -static struct v4l2_i2c_driver_data v4l2_i2c_data = { - .name = "ov7670", - .probe = ov7670_probe, - .remove = ov7670_remove, - .id_table = ov7670_id, +static struct i2c_driver ov7670_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "ov7670", + }, + .probe = ov7670_probe, + .remove = ov7670_remove, + .id_table = ov7670_id, }; + +static __init int init_ov7670(void) +{ + return i2c_add_driver(&ov7670_driver); +} + +static __exit void exit_ov7670(void) +{ + i2c_del_driver(&ov7670_driver); +} + +module_init(init_ov7670); +module_exit(exit_ov7670); |