diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-11 15:10:28 +0200 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-06-04 14:21:16 -0700 |
| commit | 2dbbe1fe96871cffbc1b734b67d54385eb522ff8 (patch) | |
| tree | 0257b04e84c2e5f74a6e8bd627f11cbaa9cf2cd3 /drivers/mfd | |
| parent | 68b0ec09c985a41aebe42e181d55170bd9962105 (diff) | |
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>
(cherry picked from commit 7f65f74ccee15f6eb0009921a428e3c5d5d06ae0)
Change-Id: I1592020268c408effc331069b7ae241c6da248bb
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/105927
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/tps65910.c | 5 |
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; } |