lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB: msp3400: remove obsolete v4l2-i2c-drv.h header

Browse Source 
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:22:34 -03:00
committed by Mauro Carvalho Chehab
parent dfc5a0161f
commit 61a489c8ba
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/media/video/msp3400-driver.c
View File

@@ -56,7 +56,6 @@
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include <media/v4l2-i2c-drv.h>
#include <media/msp3400.h> #include <media/msp3400.h>
#include <media/tvaudio.h> #include <media/tvaudio.h>
#include "msp3400-driver.h" #include "msp3400-driver.h"
@@ -843,8 +842,11 @@ static const struct i2c_device_id msp_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, msp_id); MODULE_DEVICE_TABLE(i2c, msp_id);
static struct v4l2_i2c_driver_data v4l2_i2c_data = { static struct i2c_driver msp_driver = {
.driver = {
.owner = THIS_MODULE,
.name = "msp3400", .name = "msp3400",
},
.probe = msp_probe, .probe = msp_probe,
.remove = msp_remove, .remove = msp_remove,
.suspend = msp_suspend, .suspend = msp_suspend,
@@ -852,6 +854,19 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.id_table = msp_id, .id_table = msp_id,
}; };
static __init int init_msp(void)
{
return i2c_add_driver(&msp_driver);
}
static __exit void exit_msp(void)
{
i2c_del_driver(&msp_driver);
}
module_init(init_msp);
module_exit(exit_msp);
/* /*
* Overrides for Emacs so that we follow Linus's tabbing style. * Overrides for Emacs so that we follow Linus's tabbing style.
* --------------------------------------------------------------------------- * ---------------------------------------------------------------------------