diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-15 14:45:20 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:03 -0400 |
commit | c771145bf35b3579d0154ff2a07dbe5cdd27cac3 (patch) | |
tree | 2f33dc340b830512b8c6df8e4c3d1d5d05316af3 /drivers/media/video/tvp5150.c | |
parent | c2d999f3161e398dff3dc801629e5c0acecb9785 (diff) |
V4L/DVB: tvp5150: 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/tvp5150.c')
-rw-r--r-- | drivers/media/video/tvp5150.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index 1654f65cca7c..d62a78688b08 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
@@ -11,7 +11,6 @@ | |||
11 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
12 | #include <media/v4l2-device.h> | 12 | #include <media/v4l2-device.h> |
13 | #include <media/tvp5150.h> | 13 | #include <media/tvp5150.h> |
14 | #include <media/v4l2-i2c-drv.h> | ||
15 | #include <media/v4l2-chip-ident.h> | 14 | #include <media/v4l2-chip-ident.h> |
16 | 15 | ||
17 | #include "tvp5150_reg.h" | 16 | #include "tvp5150_reg.h" |
@@ -1111,9 +1110,25 @@ static const struct i2c_device_id tvp5150_id[] = { | |||
1111 | }; | 1110 | }; |
1112 | MODULE_DEVICE_TABLE(i2c, tvp5150_id); | 1111 | MODULE_DEVICE_TABLE(i2c, tvp5150_id); |
1113 | 1112 | ||
1114 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 1113 | static struct i2c_driver tvp5150_driver = { |
1115 | .name = "tvp5150", | 1114 | .driver = { |
1116 | .probe = tvp5150_probe, | 1115 | .owner = THIS_MODULE, |
1117 | .remove = tvp5150_remove, | 1116 | .name = "tvp5150", |
1118 | .id_table = tvp5150_id, | 1117 | }, |
1118 | .probe = tvp5150_probe, | ||
1119 | .remove = tvp5150_remove, | ||
1120 | .id_table = tvp5150_id, | ||
1119 | }; | 1121 | }; |
1122 | |||
1123 | static __init int init_tvp5150(void) | ||
1124 | { | ||
1125 | return i2c_add_driver(&tvp5150_driver); | ||
1126 | } | ||
1127 | |||
1128 | static __exit void exit_tvp5150(void) | ||
1129 | { | ||
1130 | i2c_del_driver(&tvp5150_driver); | ||
1131 | } | ||
1132 | |||
1133 | module_init(init_tvp5150); | ||
1134 | module_exit(exit_tvp5150); | ||