diff --git a/[refs] b/[refs] index 047b450190db..9f65f33302ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 930bf02299943c67a52919a23a3eaf5ee9abbbe1 +refs/heads/master: 2968ab133ec790134d4347aa4264c2eb064b42e7 diff --git a/trunk/include/linux/mfd/core.h b/trunk/include/linux/mfd/core.h index 99b7eb1961b6..3a8435a8058f 100644 --- a/trunk/include/linux/mfd/core.h +++ b/trunk/include/linux/mfd/core.h @@ -36,6 +36,10 @@ struct mfd_cell { /* platform data passed to the sub devices drivers */ void *platform_data; size_t pdata_size; + /* + * Device Tree compatible string + * See: Documentation/devicetree/usage-model.txt Chapter 2.2 for details + */ const char *of_compatible; /*