From 2a755759c5559a872327bd92a059dd5cfa069274 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Mon, 15 Jun 2009 18:01:48 +0200
Subject: [PATCH] --- yaml --- r: 151033 b: refs/heads/master c:
 fa1b2ca4fa271f9300a764b9d505a027156f749b h: refs/heads/master i:   151031:
 67f8e482beb3b46ee1dfe1105bea42902c2c4f95 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/i2c/busses/i2c-voodoo3.c | 1 -
 trunk/drivers/video/tdfxfb.c           | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6fac8c622530..a8bc0b88e63b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66b650f04576a6737579ec404446450026ff2e0b
+refs/heads/master: fa1b2ca4fa271f9300a764b9d505a027156f749b
diff --git a/trunk/drivers/i2c/busses/i2c-voodoo3.c b/trunk/drivers/i2c/busses/i2c-voodoo3.c
index 1a474acc0ddd..7663d57833a0 100644
--- a/trunk/drivers/i2c/busses/i2c-voodoo3.c
+++ b/trunk/drivers/i2c/busses/i2c-voodoo3.c
@@ -163,7 +163,6 @@ static struct i2c_algo_bit_data voo_i2c_bit_data = {
 
 static struct i2c_adapter voodoo3_i2c_adapter = {
 	.owner		= THIS_MODULE,
-	.class		= I2C_CLASS_TV_ANALOG, 
 	.name		= "I2C Voodoo3/Banshee adapter",
 	.algo_data	= &voo_i2c_bit_data,
 };
diff --git a/trunk/drivers/video/tdfxfb.c b/trunk/drivers/video/tdfxfb.c
index 89f231dc443f..ff43c8885028 100644
--- a/trunk/drivers/video/tdfxfb.c
+++ b/trunk/drivers/video/tdfxfb.c
@@ -1315,7 +1315,6 @@ static int __devinit tdfxfb_setup_i2c_bus(struct tdfxfb_i2c_chan *chan,
 
 	strlcpy(chan->adapter.name, name, sizeof(chan->adapter.name));
 	chan->adapter.owner		= THIS_MODULE;
-	chan->adapter.class		= I2C_CLASS_TV_ANALOG;
 	chan->adapter.algo_data		= &chan->algo;
 	chan->adapter.dev.parent	= dev;
 	chan->algo.setsda		= tdfxfb_i2c_setsda;