projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd...
[cascardo/linux.git]
/
include
/
linux
/
mfd
/
core.h
diff --git
a/include/linux/mfd/core.h
b/include/linux/mfd/core.h
index
60ced60
..
bdba8c6
100644
(file)
--- a/
include/linux/mfd/core.h
+++ b/
include/linux/mfd/core.h
@@
-59,6
+59,12
@@
struct mfd_cell {
* pm_runtime_no_callbacks().
*/
bool pm_runtime_no_callbacks;
* pm_runtime_no_callbacks().
*/
bool pm_runtime_no_callbacks;
+
+ /* A list of regulator supplies that should be mapped to the MFD
+ * device rather than the child device when requested
+ */
+ const char **parent_supplies;
+ int num_parent_supplies;
};
/*
};
/*