diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-15 20:32:24 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 05:06:02 +0200 |
| commit | 3f4172007aaa9fb717f7b7db8edf4b9d73aa4e7f (patch) | |
| tree | 3ab493ae11087c3f40498b378f579caad77be80d | |
| parent | V4L/DVB: saa7191: remove obsolete v4l2-i2c-drv.h header (diff) | |
| download | linux-3f4172007aaa9fb717f7b7db8edf4b9d73aa4e7f.tar.xz linux-3f4172007aaa9fb717f7b7db8edf4b9d73aa4e7f.zip | |
V4L/DVB: bt856: remove obsolete v4l2-i2c-drv.h header
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/bt856.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c index ae3337392505..a43059d4c799 100644 --- a/drivers/media/video/bt856.c +++ b/drivers/media/video/bt856.c @@ -34,11 +34,9 @@ #include <linux/ioctl.h> #include <asm/uaccess.h> #include <linux/i2c.h> -#include <linux/i2c-id.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> #include <media/v4l2-chip-ident.h> -#include <media/v4l2-i2c-drv.h> MODULE_DESCRIPTION("Brooktree-856A video encoder driver"); MODULE_AUTHOR("Mike Bernson & Dave Perks"); @@ -262,9 +260,25 @@ static const struct i2c_device_id bt856_id[] = { }; MODULE_DEVICE_TABLE(i2c, bt856_id); -static struct v4l2_i2c_driver_data v4l2_i2c_data = { - .name = "bt856", - .probe = bt856_probe, - .remove = bt856_remove, - .id_table = bt856_id, +static struct i2c_driver bt856_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "bt856", + }, + .probe = bt856_probe, + .remove = bt856_remove, + .id_table = bt856_id, }; + +static __init int init_bt856(void) +{ + return i2c_add_driver(&bt856_driver); +} + +static __exit void exit_bt856(void) +{ + i2c_del_driver(&bt856_driver); +} + +module_init(init_bt856); +module_exit(exit_bt856); |