projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ../mine
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
include
/
linux
/
mfd
/
core.h
diff --git
a/include/linux/mfd/core.h
b/include/linux/mfd/core.h
index 11d740b8831d6fa4559a2b758ff2e1f8f9695fd5..cb93d80aa642cc316749a645e1cec02d4643764e 100644
(file)
--- a/
include/linux/mfd/core.h
+++ b/
include/linux/mfd/core.h
@@
-44,6
+44,9
@@
struct mfd_cell {
*/
int num_resources;
const struct resource *resources;
+
+ /* don't check for resource conflicts */
+ bool ignore_resource_conflicts;
};
extern int mfd_add_devices(struct device *parent, int id,