diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-15 14:04:55 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:05:58 -0400 |
commit | aac235384de6566bba363c3988c1a214d7121627 (patch) | |
tree | 61366322532b78dc629fb1394c1d23d921d58747 /drivers/media/video/saa7115.c | |
parent | 720d916e64a1bd70948b0a7e97ba0fff0e2f43d1 (diff) |
V4L/DVB: saa7115: 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/saa7115.c')
-rw-r--r-- | drivers/media/video/saa7115.c | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index ee963f4d01bc..301c62b88cad 100644 --- a/drivers/media/video/saa7115.c +++ b/drivers/media/video/saa7115.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <media/v4l2-device.h> | 47 | #include <media/v4l2-device.h> |
48 | #include <media/v4l2-ctrls.h> | 48 | #include <media/v4l2-ctrls.h> |
49 | #include <media/v4l2-chip-ident.h> | 49 | #include <media/v4l2-chip-ident.h> |
50 | #include <media/v4l2-i2c-drv.h> | ||
51 | #include <media/saa7115.h> | 50 | #include <media/saa7115.h> |
52 | #include <asm/div64.h> | 51 | #include <asm/div64.h> |
53 | 52 | ||
@@ -1676,7 +1675,7 @@ static int saa711x_remove(struct i2c_client *client) | |||
1676 | return 0; | 1675 | return 0; |
1677 | } | 1676 | } |
1678 | 1677 | ||
1679 | static const struct i2c_device_id saa7115_id[] = { | 1678 | static const struct i2c_device_id saa711x_id[] = { |
1680 | { "saa7115_auto", 1 }, /* autodetect */ | 1679 | { "saa7115_auto", 1 }, /* autodetect */ |
1681 | { "saa7111", 0 }, | 1680 | { "saa7111", 0 }, |
1682 | { "saa7113", 0 }, | 1681 | { "saa7113", 0 }, |
@@ -1685,11 +1684,27 @@ static const struct i2c_device_id saa7115_id[] = { | |||
1685 | { "saa7118", 0 }, | 1684 | { "saa7118", 0 }, |
1686 | { } | 1685 | { } |
1687 | }; | 1686 | }; |
1688 | MODULE_DEVICE_TABLE(i2c, saa7115_id); | 1687 | MODULE_DEVICE_TABLE(i2c, saa711x_id); |
1689 | 1688 | ||
1690 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 1689 | static struct i2c_driver saa711x_driver = { |
1691 | .name = "saa7115", | 1690 | .driver = { |
1692 | .probe = saa711x_probe, | 1691 | .owner = THIS_MODULE, |
1693 | .remove = saa711x_remove, | 1692 | .name = "saa7115", |
1694 | .id_table = saa7115_id, | 1693 | }, |
1694 | .probe = saa711x_probe, | ||
1695 | .remove = saa711x_remove, | ||
1696 | .id_table = saa711x_id, | ||
1695 | }; | 1697 | }; |
1698 | |||
1699 | static __init int init_saa711x(void) | ||
1700 | { | ||
1701 | return i2c_add_driver(&saa711x_driver); | ||
1702 | } | ||
1703 | |||
1704 | static __exit void exit_saa711x(void) | ||
1705 | { | ||
1706 | i2c_del_driver(&saa711x_driver); | ||
1707 | } | ||
1708 | |||
1709 | module_init(init_saa711x); | ||
1710 | module_exit(exit_saa711x); | ||