diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 09:10:17 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 09:10:17 -0800 |
commit | b3a54bf9ed76dff9dd26e1fc719431fb14604a8a (patch) | |
tree | 38d2b3f00c71a881f303a06dfe361c9d6d591014 /drivers/mfd/da9052-core.c | |
parent | c99197902da284b4b723451c1471c45b18537cde (diff) | |
parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
download | op-kernel-dev-b3a54bf9ed76dff9dd26e1fc719431fb14604a8a.zip op-kernel-dev-b3a54bf9ed76dff9dd26e1fc719431fb14604a8a.tar.gz |
Merge 3.19-rc7 into usb-next
We want the USB fixes in here to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd/da9052-core.c')
-rw-r--r-- | drivers/mfd/da9052-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/da9052-core.c b/drivers/mfd/da9052-core.c index 52a0c2f..ae498b5 100644 --- a/drivers/mfd/da9052-core.c +++ b/drivers/mfd/da9052-core.c @@ -554,7 +554,8 @@ int da9052_device_init(struct da9052 *da9052, u8 chip_id) return ret; } - ret = mfd_add_devices(da9052->dev, -1, da9052_subdev_info, + ret = mfd_add_devices(da9052->dev, PLATFORM_DEVID_AUTO, + da9052_subdev_info, ARRAY_SIZE(da9052_subdev_info), NULL, 0, NULL); if (ret) { dev_err(da9052->dev, "mfd_add_devices failed: %d\n", ret); |