From: Laurent Riffard <laurent.riffard@free.fr>
Date: Sat, 26 Nov 2005 19:52:34 +0000 (+0100)
Subject: [PATCH] i2c: Drop i2c_driver.{owner,name}, 9 of 11
X-Git-Tag: v2.6.16-rc1~935^2~1^2~19
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a7edcdca618d25564690c2df27c2c5c6e9f6316;p=linux-2.6

[PATCH] i2c: Drop i2c_driver.{owner,name}, 9 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 matroxfb driver.

Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Petr Vandrovec <petr@vandrovec.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 78994c5fe9..f6fdb69af0 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1293,8 +1293,10 @@ static int maven_command(struct i2c_client* client, unsigned int cmd, void* arg)
 }
 
 static struct i2c_driver maven_driver={
-	.owner		= THIS_MODULE,
-	.name		= "maven",
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "maven",
+	},
 	.id		= I2C_DRIVERID_MGATVO,
 	.attach_adapter	= maven_attach_adapter,
 	.detach_client	= maven_detach_client,