diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-15 18:01:48 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 03:05:58 (GMT) |
| commit | 720d916e64a1bd70948b0a7e97ba0fff0e2f43d1 (patch) | |
| tree | 6f30fac92a104ede341751225f04ff5747c633f8 | |
| parent | 51e868466d60e0aea1b5d1d822bf30fdcde24dd4 (diff) | |
| download | linux-720d916e64a1bd70948b0a7e97ba0fff0e2f43d1.tar.xz | |
V4L/DVB: saa717x: 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/saa717x.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c index 45f8bfc..b6172c2 100644 --- a/drivers/media/video/saa717x.c +++ b/drivers/media/video/saa717x.c @@ -39,7 +39,6 @@ #include <linux/i2c.h> #include <media/v4l2-device.h> #include <media/v4l2-ctrls.h> -#include <media/v4l2-i2c-drv.h> MODULE_DESCRIPTION("Philips SAA717x audio/video decoder driver"); MODULE_AUTHOR("K. Ohta, T. Adachi, Hans Verkuil"); @@ -1366,9 +1365,25 @@ static const struct i2c_device_id saa717x_id[] = { }; MODULE_DEVICE_TABLE(i2c, saa717x_id); -static struct v4l2_i2c_driver_data v4l2_i2c_data = { - .name = "saa717x", - .probe = saa717x_probe, - .remove = saa717x_remove, - .id_table = saa717x_id, +static struct i2c_driver saa717x_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "saa717x", + }, + .probe = saa717x_probe, + .remove = saa717x_remove, + .id_table = saa717x_id, }; + +static __init int init_saa717x(void) +{ + return i2c_add_driver(&saa717x_driver); +} + +static __exit void exit_saa717x(void) +{ + i2c_del_driver(&saa717x_driver); +} + +module_init(init_saa717x); +module_exit(exit_saa717x); |