From: Samuel Ortiz <sameo@linux.intel.com>
Date: Fri, 11 May 2012 13:10:28 +0000 (+0200)
Subject: mfd: Fix tps65910 build failure
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=7f65f74ccee15f6eb0009921a428e3c5d5d06ae0;p=deliverable%2Flinux.git

mfd: Fix tps65910 build failure

The tps65910_parse_dt() prototype for !CONFIG_OF was not correct, leading to:

drivers/mfd/tps65910.c: In function ‘tps65910_i2c_probe’:
drivers/mfd/tps65910.c:218:3: error: too many arguments to function ‘tps65910_parse_dt’

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 553574da3611..18b30cf45e5b 100644
--- a/drivers/mfd/tps65910.c
+++ b/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;
 }