summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-05-11 15:10:28 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-05-20 17:27:00 +0200
commit7f65f74ccee15f6eb0009921a428e3c5d5d06ae0 (patch)
treeb9bc90cc809e4367f9e65cb1d80b0b6c961ff525 /drivers/mfd
parentmfd: Register tps65910 gpios as an mfd device (diff)
downloadlinux-7f65f74ccee15f6eb0009921a428e3c5d5d06ae0.tar.xz
linux-7f65f74ccee15f6eb0009921a428e3c5d5d06ae0.zip
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>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/tps65910.c5
1 files changed, 3 insertions, 2 deletions
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;
}