Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+15
-8
+10
MAINTAINERS
+10
MAINTAINERS
···
708
708
F: drivers/staging/iio/*/ad*
709
709
F: staging/iio/trigger/iio-trig-bfin-timer.c
710
710
711
+
ANDROID DRIVERS
712
+
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
713
+
M: Arve Hj�nnev�g <arve@android.com>
714
+
M: Riley Andrews <riandrews@android.com>
715
+
T: git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
716
+
L: devel@driverdev.osuosl.org
717
+
S: Supported
718
+
F: drivers/android/
719
+
F: drivers/staging/android/
720
+
711
721
AOA (Apple Onboard Audio) ALSA DRIVER
712
722
M: Johannes Berg <johannes@sipsolutions.net>
713
723
L: linuxppc-dev@lists.ozlabs.org
+5
-8
drivers/staging/nvec/nvec.c
+5
-8
drivers/staging/nvec/nvec.c
···
85
85
static const struct mfd_cell nvec_devices[] = {
86
86
{
87
87
.name = "nvec-kbd",
88
-
.id = 1,
89
88
},
90
89
{
91
90
.name = "nvec-mouse",
92
-
.id = 1,
91
+
},
92
+
{
93
+
.name = "nvec-power",
94
+
.id = 0,
93
95
},
94
96
{
95
97
.name = "nvec-power",
96
98
.id = 1,
97
-
},
98
-
{
99
-
.name = "nvec-power",
100
-
.id = 2,
101
99
},
102
100
{
103
101
.name = "nvec-paz00",
104
-
.id = 1,
105
102
},
106
103
};
107
104
···
888
891
nvec_msg_free(nvec, msg);
889
892
}
890
893
891
-
ret = mfd_add_devices(nvec->dev, -1, nvec_devices,
894
+
ret = mfd_add_devices(nvec->dev, 0, nvec_devices,
892
895
ARRAY_SIZE(nvec_devices), NULL, 0, NULL);
893
896
if (ret)
894
897
dev_err(nvec->dev, "error adding subdevices\n");