dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Hans Verkuil 2010-09-15 15:04:55 -03:00 committed by Mauro Carvalho Chehab
parent 720d916e64
commit aac235384d
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/media/video/saa7115.c
View File

@ -47,7 +47,6 @@
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-chip-ident.h>
#include <media/v4l2-i2c-drv.h>
#include <media/saa7115.h>
#include <asm/div64.h>
@ -1676,7 +1675,7 @@ static int saa711x_remove(struct i2c_client *client)
return 0;
}
static const struct i2c_device_id saa7115_id[] = {
static const struct i2c_device_id saa711x_id[] = {
{ "saa7115_auto", 1 }, /* autodetect */
{ "saa7111", 0 },
{ "saa7113", 0 },
@ -1685,11 +1684,27 @@ static const struct i2c_device_id saa7115_id[] = {
{ "saa7118", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, saa7115_id);
MODULE_DEVICE_TABLE(i2c, saa711x_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "saa7115",
.probe = saa711x_probe,
.remove = saa711x_remove,
.id_table = saa7115_id,
static struct i2c_driver saa711x_driver = {
.driver = {
.owner = THIS_MODULE,
.name = "saa7115",
},
.probe = saa711x_probe,
.remove = saa711x_remove,
.id_table = saa711x_id,
};
static __init int init_saa711x(void)
{
return i2c_add_driver(&saa711x_driver);
}
static __exit void exit_saa711x(void)
{
i2c_del_driver(&saa711x_driver);
}
module_init(init_saa711x);
module_exit(exit_saa711x);