Commit 5921dfe8 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'staging-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging tree fixes from Greg KH:
 "Here are two tiny staging tree fixes.  One for the nvec driver to
  resolve a reported problem, and one to add a MAINTAINERS entry for the
  Android drivers"

* tag 'staging-3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  MAINTAINERS: add Android driver entries
  staging: nvec: specify a platform-device base id
parents 73dc61cb 41c9e95d
...@@ -708,6 +708,16 @@ X: drivers/iio/*/adjd* ...@@ -708,6 +708,16 @@ X: drivers/iio/*/adjd*
F: drivers/staging/iio/*/ad* F: drivers/staging/iio/*/ad*
F: staging/iio/trigger/iio-trig-bfin-timer.c F: staging/iio/trigger/iio-trig-bfin-timer.c
ANDROID DRIVERS
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
M: Arve Hjønnevåg <arve@android.com>
M: Riley Andrews <riandrews@android.com>
T: git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
L: devel@driverdev.osuosl.org
S: Supported
F: drivers/android/
F: drivers/staging/android/
AOA (Apple Onboard Audio) ALSA DRIVER AOA (Apple Onboard Audio) ALSA DRIVER
M: Johannes Berg <johannes@sipsolutions.net> M: Johannes Berg <johannes@sipsolutions.net>
L: linuxppc-dev@lists.ozlabs.org L: linuxppc-dev@lists.ozlabs.org
......
...@@ -85,23 +85,20 @@ static struct nvec_chip *nvec_power_handle; ...@@ -85,23 +85,20 @@ static struct nvec_chip *nvec_power_handle;
static const struct mfd_cell nvec_devices[] = { static const struct mfd_cell nvec_devices[] = {
{ {
.name = "nvec-kbd", .name = "nvec-kbd",
.id = 1,
}, },
{ {
.name = "nvec-mouse", .name = "nvec-mouse",
.id = 1,
}, },
{ {
.name = "nvec-power", .name = "nvec-power",
.id = 1, .id = 0,
}, },
{ {
.name = "nvec-power", .name = "nvec-power",
.id = 2, .id = 1,
}, },
{ {
.name = "nvec-paz00", .name = "nvec-paz00",
.id = 1,
}, },
}; };
...@@ -891,7 +888,7 @@ static int tegra_nvec_probe(struct platform_device *pdev) ...@@ -891,7 +888,7 @@ static int tegra_nvec_probe(struct platform_device *pdev)
nvec_msg_free(nvec, msg); nvec_msg_free(nvec, msg);
} }
ret = mfd_add_devices(nvec->dev, -1, nvec_devices, ret = mfd_add_devices(nvec->dev, 0, nvec_devices,
ARRAY_SIZE(nvec_devices), NULL, 0, NULL); ARRAY_SIZE(nvec_devices), NULL, 0, NULL);
if (ret) if (ret)
dev_err(nvec->dev, "error adding subdevices\n"); dev_err(nvec->dev, "error adding subdevices\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment