diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-15 15:38:54 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:06:02 -0200 |
| commit | ff6e5422e4a6db93e05c8d29c1db79540f1f1707 (patch) | |
| tree | d1d10b6b2246c4dc52b31448caf9b5c300ef066c | |
| parent | cd5882c531717090e3e3501be0a2c2ebe5ec79c6 (diff) | |
| download | linux-ff6e5422e4a6db93e05c8d29c1db79540f1f1707.tar.gz linux-ff6e5422e4a6db93e05c8d29c1db79540f1f1707.tar.bz2 linux-ff6e5422e4a6db93e05c8d29c1db79540f1f1707.zip | |
V4L/DVB: saa7110: 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/saa7110.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c index 3bca744e43af..7913f93979b8 100644 --- a/drivers/media/video/saa7110.c +++ b/drivers/media/video/saa7110.c @@ -36,7 +36,6 @@ #include <linux/videodev2.h> #include <media/v4l2-device.h> #include <media/v4l2-chip-ident.h> -#include <media/v4l2-i2c-drv.h> MODULE_DESCRIPTION("Philips SAA7110 video decoder driver"); MODULE_AUTHOR("Pauline Middelink"); @@ -505,9 +504,25 @@ static const struct i2c_device_id saa7110_id[] = { }; MODULE_DEVICE_TABLE(i2c, saa7110_id); -static struct v4l2_i2c_driver_data v4l2_i2c_data = { - .name = "saa7110", - .probe = saa7110_probe, - .remove = saa7110_remove, - .id_table = saa7110_id, +static struct i2c_driver saa7110_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "saa7110", + }, + .probe = saa7110_probe, + .remove = saa7110_remove, + .id_table = saa7110_id, }; + +static __init int init_saa7110(void) +{ + return i2c_add_driver(&saa7110_driver); +} + +static __exit void exit_saa7110(void) +{ + i2c_del_driver(&saa7110_driver); +} + +module_init(init_saa7110); +module_exit(exit_saa7110); |