summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tvmixer.c
diff options
context:
space:
mode:
authorLaurent Riffard <laurent.riffard@free.fr>2005-11-26 20:43:39 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-05 22:16:23 -0800
commit604f28e2b8d34cbaf08f0351374645f161335a82 (patch)
tree0f9183994b4fafa6ac58ce8e090fb8e2bf4869dd /drivers/media/video/tvmixer.c
parenta33ca23231a37e28d15da9546b1f3e83dc48284b (diff)
downloadop-kernel-dev-604f28e2b8d34cbaf08f0351374645f161335a82.zip
op-kernel-dev-604f28e2b8d34cbaf08f0351374645f161335a82.tar.gz
[PATCH] i2c: Drop i2c_driver.{owner,name}, 5 of 11
We should use the i2c_driver.driver's .name and .owner fields instead of the i2c_driver's ones. This patch updates the drivers/media/video and usb/media drivers. Signed-off-by: Laurent Riffard <laurent.riffard@free.fr> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/media/video/tvmixer.c')
-rw-r--r--drivers/media/video/tvmixer.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 936e01d..5f4d0185 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -228,9 +228,13 @@ static int tvmixer_release(struct inode *inode, struct file *file)
static struct i2c_driver driver = {
#ifdef I2C_PEC
- .owner = THIS_MODULE,
-#endif
+ .driver = {
+ .owner = THIS_MODULE,
+ .name = "tv card mixer driver",
+ },
+#else
.name = "tv card mixer driver",
+#endif
.id = I2C_DRIVERID_TVMIXER,
.detach_adapter = tvmixer_adapters,
.attach_adapter = tvmixer_adapters,
OpenPOWER on IntegriCloud