aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-09-15 14:53:43 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:06:04 -0400
commit22ac5f67a6c3626bd2834c9095cbc1e56c5abbce (patch)
tree4bb0f8390b94cc64467b3dc48c6c2fecc0e78cc7
parent978cff6bf3ccb2b4ca37108d64d295f5993e713e (diff)
V4L/DVB: s2250: remove obsolete v4l2-i2c-drv.h header
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/staging/go7007/s2250-board.c27
1 files changed, 21 insertions, 6 deletions
diff --git a/drivers/staging/go7007/s2250-board.c b/drivers/staging/go7007/s2250-board.c
index db8ac51279f9..e7736a915530 100644
--- a/drivers/staging/go7007/s2250-board.c
+++ b/drivers/staging/go7007/s2250-board.c
@@ -23,7 +23,6 @@
23#include <linux/slab.h> 23#include <linux/slab.h>
24#include <media/v4l2-device.h> 24#include <media/v4l2-device.h>
25#include <media/v4l2-common.h> 25#include <media/v4l2-common.h>
26#include <media/v4l2-i2c-drv.h>
27#include <media/v4l2-subdev.h> 26#include <media/v4l2-subdev.h>
28#include "go7007-priv.h" 27#include "go7007-priv.h"
29 28
@@ -675,9 +674,25 @@ static const struct i2c_device_id s2250_id[] = {
675}; 674};
676MODULE_DEVICE_TABLE(i2c, s2250_id); 675MODULE_DEVICE_TABLE(i2c, s2250_id);
677 676
678static struct v4l2_i2c_driver_data v4l2_i2c_data = { 677static struct i2c_driver s2250_driver = {
679 .name = "s2250", 678 .driver = {
680 .probe = s2250_probe, 679 .owner = THIS_MODULE,
681 .remove = s2250_remove, 680 .name = "s2250",
682 .id_table = s2250_id, 681 },
682 .probe = s2250_probe,
683 .remove = s2250_remove,
684 .id_table = s2250_id,
683}; 685};
686
687static __init int init_s2250(void)
688{
689 return i2c_add_driver(&s2250_driver);
690}
691
692static __exit void exit_s2250(void)
693{
694 i2c_del_driver(&s2250_driver);
695}
696
697module_init(init_s2250);
698module_exit(exit_s2250);