diff options
| author | Hans Verkuil | 2010-09-15 20:48:49 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2010-10-21 05:06:04 +0200 |
| commit | ad62cdfe396a7f51b200db8c85e75805028889a0 (patch) | |
| tree | a2dc76ce7c08be93f506025d611ff7db7cb5760b /drivers/media/video/cx25840/cx25840-core.c | |
| parent | V4L/DVB: saa7127: remove obsolete v4l2-i2c-drv.h header (diff) | |
| download | kernel-qcow2-linux-ad62cdfe396a7f51b200db8c85e75805028889a0.tar.gz kernel-qcow2-linux-ad62cdfe396a7f51b200db8c85e75805028889a0.tar.xz kernel-qcow2-linux-ad62cdfe396a7f51b200db8c85e75805028889a0.zip | |
V4L/DVB: cx25840: 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/cx25840/cx25840-core.c')
| -rw-r--r-- | drivers/media/video/cx25840/cx25840-core.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index f5a3e74c3c7c..f26f9da24c8c 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c @@ -42,7 +42,6 @@ #include <linux/delay.h> #include <media/v4l2-common.h> #include <media/v4l2-chip-ident.h> -#include <media/v4l2-i2c-drv.h> #include <media/cx25840.h> #include "cx25840-core.h" @@ -2043,9 +2042,25 @@ static const struct i2c_device_id cx25840_id[] = { }; MODULE_DEVICE_TABLE(i2c, cx25840_id); -static struct v4l2_i2c_driver_data v4l2_i2c_data = { - .name = "cx25840", - .probe = cx25840_probe, - .remove = cx25840_remove, - .id_table = cx25840_id, +static struct i2c_driver cx25840_driver = { + .driver = { + .owner = THIS_MODULE, + .name = "cx25840", + }, + .probe = cx25840_probe, + .remove = cx25840_remove, + .id_table = cx25840_id, }; + +static __init int init_cx25840(void) +{ + return i2c_add_driver(&cx25840_driver); +} + +static __exit void exit_cx25840(void) +{ + i2c_del_driver(&cx25840_driver); +} + +module_init(init_cx25840); +module_exit(exit_cx25840); |