From 5ade69f37f77df54a1b76cb41e28919ef1f0ae97 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Fri, 11 May 2012 15:10:28 +0200
Subject: [PATCH] --- yaml --- r: 308739 b: refs/heads/master c:
 7f65f74ccee15f6eb0009921a428e3c5d5d06ae0 h: refs/heads/master i:   308737:
 3a14dbe7950bd1c7efecbc59b08e99cae4584c81   308735:
 3a272cbf4d8804389c99dfc8f36c7b47b68a3c0d v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/mfd/tps65910.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index edc994cc441b..923145cb052d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32df986e985921386b75b4bd1117102bf65fe095
+refs/heads/master: 7f65f74ccee15f6eb0009921a428e3c5d5d06ae0
diff --git a/trunk/drivers/mfd/tps65910.c b/trunk/drivers/mfd/tps65910.c
index 553574da3611..18b30cf45e5b 100644
--- a/trunk/drivers/mfd/tps65910.c
+++ b/trunk/drivers/mfd/tps65910.c
@@ -196,8 +196,9 @@ static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
 	return board_info;
 }
 #else
-static inline struct tps65910_board *tps65910_parse_dt(
-					struct i2c_client *client)
+static inline
+struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
+					 int *chip_id)
 {
 	return NULL;
 }