diff options
| author | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 06:46:32 -0400 |
|---|---|---|
| committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-10-08 06:46:32 -0400 |
| commit | 102084d3d3969646cc89ea159e50898aeafc6649 (patch) | |
| tree | e92924469b3fab3ee6fa29e338e0a3a4cb167e82 /drivers/mfd/tps6105x.c | |
| parent | 6ccbe607132bd823abbad8d32b13af89161707da (diff) | |
| parent | 979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff) | |
Merge tag 'v3.6-rc7' into i2c-embedded/for-next
Linux 3.6-rc7
Needed to get updates from i2c-embedded/for-current into i2c-embedded/for-next
Diffstat (limited to 'drivers/mfd/tps6105x.c')
| -rw-r--r-- | drivers/mfd/tps6105x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/tps6105x.c b/drivers/mfd/tps6105x.c index a293b978e27c..14051bdc714b 100644 --- a/drivers/mfd/tps6105x.c +++ b/drivers/mfd/tps6105x.c | |||
| @@ -188,7 +188,7 @@ static int __devinit tps6105x_probe(struct i2c_client *client, | |||
| 188 | } | 188 | } |
| 189 | 189 | ||
| 190 | ret = mfd_add_devices(&client->dev, 0, tps6105x_cells, | 190 | ret = mfd_add_devices(&client->dev, 0, tps6105x_cells, |
| 191 | ARRAY_SIZE(tps6105x_cells), NULL, 0); | 191 | ARRAY_SIZE(tps6105x_cells), NULL, 0, NULL); |
| 192 | if (ret) | 192 | if (ret) |
| 193 | goto fail; | 193 | goto fail; |
| 194 | 194 | ||