Merge tag 'mfd-for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[cascardo/linux.git] / include / linux / mfd / core.h

diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h
index 4a0268a..99c0395 100644 (file)
--- a/include/linux/mfd/core.h
+++ b/include/linux/mfd/core.h
@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 
 struct irq_domain;
-struct property_set;
+struct property_entry;
 
 /* Matches ACPI PNP id, either _HID or _CID, or ACPI _ADR */
 struct mfd_cell_acpi_match {
@@ -47,7 +47,7 @@ struct mfd_cell {
        size_t                  pdata_size;
 
        /* device properties passed to the sub devices drivers */
-       const struct property_set *pset;
+       struct property_entry *properties;
 
        /*
         * Device Tree compatible string