diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-09-25 07:24:59 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-09-25 07:26:55 (GMT) |
commit | 9b20aa63b8fc9a6a3b6831f4eae3621755e51211 (patch) | |
tree | 0c379f3f3d84411246b49e1c8557480bb0f1d0b0 /drivers/mfd/palmas.c | |
parent | 7ece55a4a3a04abe37118b1d4fb0b702eeb1de4c (diff) | |
parent | 979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff) | |
download | linux-fsl-qoriq-9b20aa63b8fc9a6a3b6831f4eae3621755e51211.tar.xz |
Merge tag 'v3.6-rc7' into core/rcu
Merge Linux 3.6-rc7, to pick up fixes and to resolve a conflict in an
upcoming pull.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/mfd/palmas.c')
-rw-r--r-- | drivers/mfd/palmas.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c index c4a69f1..a345f9bb 100644 --- a/drivers/mfd/palmas.c +++ b/drivers/mfd/palmas.c @@ -453,7 +453,8 @@ static int __devinit palmas_i2c_probe(struct i2c_client *i2c, ret = mfd_add_devices(palmas->dev, -1, children, ARRAY_SIZE(palmas_children), - NULL, regmap_irq_chip_get_base(palmas->irq_data)); + NULL, regmap_irq_chip_get_base(palmas->irq_data), + NULL); kfree(children); if (ret < 0) |