From 2dbbe1fe96871cffbc1b734b67d54385eb522ff8 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Fri, 11 May 2012 15:10:28 +0200 Subject: mfd: Fix tps65910 build failure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 7f65f74ccee15f6eb0009921a428e3c5d5d06ae0) Change-Id: I1592020268c408effc331069b7ae241c6da248bb Signed-off-by: Laxman Dewangan Reviewed-on: http://git-master/r/105927 GVS: Gerrit_Virtual_Submit --- drivers/mfd/tps65910.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers') 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; } -- cgit v1.2.3