diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-15 13:58:16 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:05:57 -0400 |
commit | 49facfaaf5caa8390ab6037ed1994b793f04eb66 (patch) | |
tree | a830b2975810b655f01bc840f7f69b76e1e67c57 /drivers/media/video/wm8739.c | |
parent | 1f3526673f71124b16cc619adee8c7a0c1373f26 (diff) |
V4L/DVB: wm8739: 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/wm8739.c')
-rw-r--r-- | drivers/media/video/wm8739.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c index d5965543ecab..a22f765e968a 100644 --- a/drivers/media/video/wm8739.c +++ b/drivers/media/video/wm8739.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/videodev2.h> | 30 | #include <linux/videodev2.h> |
31 | #include <media/v4l2-device.h> | 31 | #include <media/v4l2-device.h> |
32 | #include <media/v4l2-chip-ident.h> | 32 | #include <media/v4l2-chip-ident.h> |
33 | #include <media/v4l2-i2c-drv.h> | ||
34 | #include <media/v4l2-ctrls.h> | 33 | #include <media/v4l2-ctrls.h> |
35 | 34 | ||
36 | MODULE_DESCRIPTION("wm8739 driver"); | 35 | MODULE_DESCRIPTION("wm8739 driver"); |
@@ -282,9 +281,25 @@ static const struct i2c_device_id wm8739_id[] = { | |||
282 | }; | 281 | }; |
283 | MODULE_DEVICE_TABLE(i2c, wm8739_id); | 282 | MODULE_DEVICE_TABLE(i2c, wm8739_id); |
284 | 283 | ||
285 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 284 | static struct i2c_driver wm8739_driver = { |
286 | .name = "wm8739", | 285 | .driver = { |
287 | .probe = wm8739_probe, | 286 | .owner = THIS_MODULE, |
288 | .remove = wm8739_remove, | 287 | .name = "wm8739", |
289 | .id_table = wm8739_id, | 288 | }, |
289 | .probe = wm8739_probe, | ||
290 | .remove = wm8739_remove, | ||
291 | .id_table = wm8739_id, | ||
290 | }; | 292 | }; |
293 | |||
294 | static __init int init_wm8739(void) | ||
295 | { | ||
296 | return i2c_add_driver(&wm8739_driver); | ||
297 | } | ||
298 | |||
299 | static __exit void exit_wm8739(void) | ||
300 | { | ||
301 | i2c_del_driver(&wm8739_driver); | ||
302 | } | ||
303 | |||
304 | module_init(init_wm8739); | ||
305 | module_exit(exit_wm8739); | ||