From 8ec16d7a8441bb4b66bb166f8010501cc571f61a Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Tue, 9 Aug 2011 20:17:29 +0200
Subject: [PATCH] --- yaml --- r: 263281 b: refs/heads/master c:
 c8d47631a48f254d062db8084776d1fb24785e7b h: refs/heads/master i:   263279:
 9f4d9d8fa5160d5b56f031089e66e8a5443f7381 v: v3

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

diff --git a/[refs] b/[refs]
index 71b43ff87dda..58a289bc532f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 584b408d37af4e0b38ad5b60f236381bcdf396bc
+refs/heads/master: c8d47631a48f254d062db8084776d1fb24785e7b
diff --git a/trunk/drivers/i2c/busses/i2c-nomadik.c b/trunk/drivers/i2c/busses/i2c-nomadik.c
index f9b8854fe0a5..b228e09c5d05 100644
--- a/trunk/drivers/i2c/busses/i2c-nomadik.c
+++ b/trunk/drivers/i2c/busses/i2c-nomadik.c
@@ -146,6 +146,7 @@ struct i2c_nmk_client {
  * @stop: stop condition
  * @xfer_complete: acknowledge completion for a I2C message
  * @result: controller propogated result
+ * @regulator: pointer to i2c regulator
  * @busy: Busy doing transfer
  */
 struct nmk_i2c_dev {
@@ -509,7 +510,7 @@ static int write_i2c(struct nmk_i2c_dev *dev)
 
 	if (timeout < 0) {
 		dev_err(&dev->pdev->dev,
-			"wait_for_completion_timeout"
+			"wait_for_completion_timeout "
 			"returned %d waiting for event\n", timeout);
 		status = timeout;
 	}