diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-06 23:07:33 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-06 23:07:33 +0300 |
| commit | dab2e29402f40431d2199e6faff48174204d2d06 (patch) | |
| tree | c1e17dec728f4badd623d24c77679f219af247dd /include/linux/mfd | |
| parent | 0224a4a30b57385a60065aa598181868881d8fc6 (diff) | |
| parent | f4d05266032346531b9f889e26aa31a0cf2a9822 (diff) | |
| download | linux-dab2e29402f40431d2199e6faff48174204d2d06.tar.xz | |
Merge back new device properties material for v4.7.
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/core.h b/include/linux/mfd/core.h index bc6f7e00fb3d..9837f1e8c94c 100644 --- 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 |