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/cs5535-mfd.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/cs5535-mfd.c')
-rw-r--r-- | drivers/mfd/cs5535-mfd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/cs5535-mfd.c b/drivers/mfd/cs5535-mfd.c index 3419e72..2b28213 100644 --- a/drivers/mfd/cs5535-mfd.c +++ b/drivers/mfd/cs5535-mfd.c @@ -149,7 +149,7 @@ static int __devinit cs5535_mfd_probe(struct pci_dev *pdev, } err = mfd_add_devices(&pdev->dev, -1, cs5535_mfd_cells, - ARRAY_SIZE(cs5535_mfd_cells), NULL, 0); + ARRAY_SIZE(cs5535_mfd_cells), NULL, 0, NULL); if (err) { dev_err(&pdev->dev, "MFD add devices failed: %d\n", err); goto err_disable; |