aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2013-11-11 17:44:31 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2013-11-11 17:44:31 -0500
commit90b128ed1557c2f523995a379a53e5105891ecf8 (patch)
treed64cc5dc7448b0dba62b14565e2d187245f7874e /include/linux
parent5e90169c5a02da69a1ef721bea7a823e9e48fcb6 (diff)
parent9a46847aeac1148d8b15f0db629c8bbd754dfe24 (diff)
Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd
mfd-lee-3.13-3 MFD patches due for v3.13 - 2nd round.
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mfd/core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index cebe97ee98b8..60ced604664f 100644
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -98,7 +98,7 @@ static inline const struct mfd_cell *mfd_get_cell(struct platform_device *pdev)
98} 98}
99 99
100extern int mfd_add_devices(struct device *parent, int id, 100extern int mfd_add_devices(struct device *parent, int id,
101 struct mfd_cell *cells, int n_devs, 101 const struct mfd_cell *cells, int n_devs,
102 struct resource *mem_base, 102 struct resource *mem_base,
103 int irq_base, struct irq_domain *irq_domain); 103 int irq_base, struct irq_domain *irq_domain);
104 104