diff options
| author | Hans Verkuil | 2010-09-15 20:26:38 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2010-10-21 05:06:00 +0200 |
| commit | 7a004d135c3f15842c113db4864f4315c1c61f1d (patch) | |
| tree | b027ba3e6ea28fbde4cd0da7c186bc22a7c41029 /drivers/media/video/tvaudio.c | |
| parent | V4L/DVB: tea6415c: remove obsolete v4l2-i2c-drv.h header (diff) | |
| download | kernel-qcow2-linux-7a004d135c3f15842c113db4864f4315c1c61f1d.tar.gz kernel-qcow2-linux-7a004d135c3f15842c113db4864f4315c1c61f1d.tar.xz kernel-qcow2-linux-7a004d135c3f15842c113db4864f4315c1c61f1d.zip | |
V4L/DVB: tvaudio: 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/tvaudio.c')
| -rw-r--r-- | drivers/media/video/tvaudio.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index 800fc1b111ef..9a836e0efb47 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c @@ -35,7 +35,6 @@ #include <media/tvaudio.h> #include <media/v4l2-device.h> #include <media/v4l2-chip-ident.h> -#include <media/v4l2-i2c-drv.h> #include <media/i2c-addr.h> @@ -2079,9 +2078,25 @@ static const struct i2c_device_id tvaudio_id[] = { }; MODULE_DEVICE_TABLE(i2c, tvaudio_id); -static struct v4l2_i2c_driver_data v4l2_i2c_data = { - .name = "tvaudio", - .probe = tvaudio_probe, - .remove = tvaudio_remove, - .id_table = tvaudio_id, +static struct i2c_driver tvaudio_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "tvaudio", + }, + .probe = tvaudio_probe, + .remove = tvaudio_remove, + .id_table = tvaudio_id, }; + +static __init int init_tvaudio(void) +{ + return i2c_add_driver(&tvaudio_driver); +} + +static __exit void exit_tvaudio(void) +{ + i2c_del_driver(&tvaudio_driver); +} + +module_init(init_tvaudio); +module_exit(exit_tvaudio); |