---

yaml --- r: 272459 b: refs/heads/master c: 85ea256 h: refs/heads/master i: 272457: 157a500 272455: 8b58675 v: v3
git-mirror · Oct 29, 2011 · f546b33 · f546b33
1 parent 4143443
commit f546b33
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5de6467d2a54eb81b139f29b217d0394e8a790c
+refs/heads/master: 85ea25698843d37b6f79927b2995644623fe1e06
diff --git a/trunk/drivers/i2c/busses/i2c-au1550.c b/trunk/drivers/i2c/busses/i2c-au1550.c
@@ -52,7 +52,6 @@
 struct i2c_au1550_data {
 	void __iomem *psc_base;
 	int	xfer_timeout;
-	int	ack_timeout;
 	struct i2c_adapter adap;
 	struct resource *ioarea;
 };
@@ -346,7 +345,6 @@ i2c_au1550_probe(struct platform_device *pdev)
 		goto out_map;
 	}
 	priv->xfer_timeout = 200;
-	priv->ack_timeout = 200;
 
 	priv->adap.nr = pdev->id;
 	priv->adap.algo = &au1550_algo;