aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-09-15 14:14:36 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:05:59 -0400
commit099bd5e3bed01ebf55d9b7a2f8f02557c9f66786 (patch)
tree5a474931ca1644913126144523408e4507d487c6 /drivers/media/video/saa7134
parent440d0516167966efa47ec35e4e3d1120fa07b1c7 (diff)
V4L/DVB: saa6752hs: 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/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa6752hs.c27
1 files changed, 21 insertions, 6 deletions
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 40fd31ca7716..f9f29cc93a8a 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -36,7 +36,6 @@
36#include <media/v4l2-device.h> 36#include <media/v4l2-device.h>
37#include <media/v4l2-common.h> 37#include <media/v4l2-common.h>
38#include <media/v4l2-chip-ident.h> 38#include <media/v4l2-chip-ident.h>
39#include <media/v4l2-i2c-drv.h>
40#include <linux/init.h> 39#include <linux/init.h>
41#include <linux/crc32.h> 40#include <linux/crc32.h>
42 41
@@ -992,13 +991,29 @@ static const struct i2c_device_id saa6752hs_id[] = {
992}; 991};
993MODULE_DEVICE_TABLE(i2c, saa6752hs_id); 992MODULE_DEVICE_TABLE(i2c, saa6752hs_id);
994 993
995static struct v4l2_i2c_driver_data v4l2_i2c_data = { 994static struct i2c_driver saa6752hs_driver = {
996 .name = "saa6752hs", 995 .driver = {
997 .probe = saa6752hs_probe, 996 .owner = THIS_MODULE,
998 .remove = saa6752hs_remove, 997 .name = "saa6752hs",
999 .id_table = saa6752hs_id, 998 },
999 .probe = saa6752hs_probe,
1000 .remove = saa6752hs_remove,
1001 .id_table = saa6752hs_id,
1000}; 1002};
1001 1003
1004static __init int init_saa6752hs(void)
1005{
1006 return i2c_add_driver(&saa6752hs_driver);
1007}
1008
1009static __exit void exit_saa6752hs(void)
1010{
1011 i2c_del_driver(&saa6752hs_driver);
1012}
1013
1014module_init(init_saa6752hs);
1015module_exit(exit_saa6752hs);
1016
1002/* 1017/*
1003 * Overrides for Emacs so that we follow Linus's tabbing style. 1018 * Overrides for Emacs so that we follow Linus's tabbing style.
1004 * --------------------------------------------------------------------------- 1019 * ---------------------------------------------------------------------------