---

yaml --- r: 308739 b: refs/heads/master c: 7f65f74 h: refs/heads/master i: 308737: 3a14dbe 308735: 3a272cb v: v3
git-mirror · May 20, 2012 · 5ade69f · 5ade69f
1 parent 6e061bd
commit 5ade69f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;
 }