From f546b338b5d878bf44281657a2ae35499e64d6f0 Mon Sep 17 00:00:00 2001
From: Manuel Lauss <manuel.lauss@googlemail.com>
Date: Sat, 22 Oct 2011 13:34:37 +0200
Subject: [PATCH] --- yaml --- r: 272459 b: refs/heads/master c:
 85ea25698843d37b6f79927b2995644623fe1e06 h: refs/heads/master i:   272457:
 157a500d49f87ccf95c0963da89cbc7f12d7a27e   272455:
 8b5867519edf11c69037fa223d37d9410aeab86e v: v3

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

diff --git a/[refs] b/[refs]
index be995327e55a..bdce65a450b2 100644
--- 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
index 70b027c9037d..98ee11aa9e2c 100644
--- 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;