diff options
| author | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-09-24 19:10:08 -0700 |
|---|---|---|
| committer | Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-09-24 19:12:01 -0700 |
| commit | 18766f0936d444fd7ff2e0064bd6e69a89d5c6fc (patch) | |
| tree | b3e44515085c6d52747f25d57fa63e915b569c29 /drivers/mfd/rdc321x-southbridge.c | |
| parent | c10a002a2b4af557730e71591c529fbdf355433f (diff) | |
| parent | 0848c94fb4a5cc213a7fb0fb3a5721ad6e16f096 (diff) | |
| download | talos-op-linux-18766f0936d444fd7ff2e0064bd6e69a89d5c6fc.tar.gz talos-op-linux-18766f0936d444fd7ff2e0064bd6e69a89d5c6fc.zip | |
Merge with upstream to accommodate with MFD changes
commit 0848c94fb4 ("mfd: core: Push irqdomain mapping out into devices")
that appeared in v3.6-rc6 adds another argument to the mfd_add_devices()
call, and that makes commit a830d28b48bf ("power_supply: Enable
battery-charger for 88pm860x", which is battery tree) no longer compatible
with the latest kernels.
This commit is used to merge upstream back into battery tree and
accommodate 88pm860x driver for the latest changes in MFD core.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Reported-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/mfd/rdc321x-southbridge.c')
| -rw-r--r-- | drivers/mfd/rdc321x-southbridge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c index 685d61e431ad..0f70dce61160 100644 --- a/drivers/mfd/rdc321x-southbridge.c +++ b/drivers/mfd/rdc321x-southbridge.c @@ -87,7 +87,8 @@ static int __devinit rdc321x_sb_probe(struct pci_dev *pdev, rdc321x_wdt_pdata.sb_pdev = pdev; return mfd_add_devices(&pdev->dev, -1, - rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells), NULL, 0); + rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells), + NULL, 0, NULL); } static void __devexit rdc321x_sb_remove(struct pci_dev *pdev) |
