Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[deliverable/linux.git] / drivers / mfd / intel-lpss.h

diff --git a/drivers/mfd/intel-lpss.h b/drivers/mfd/intel-lpss.h
index 0dcea9eb2d0308cf63de7d79b826eff36f65f32b..694116630ffa31cde5ee7359c9575914e7fe1de2 100644 (file)
--- a/drivers/mfd/intel-lpss.h
+++ b/drivers/mfd/intel-lpss.h
@@ -16,14 +16,14 @@
 
 struct device;
 struct resource;
-struct property_set;
+struct property_entry;
 
 struct intel_lpss_platform_info {
        struct resource *mem;
        int irq;
        unsigned long clk_rate;
        const char *clk_con_id;
-       struct property_set *pset;
+       struct property_entry *properties;
 };
 
 int intel_lpss_probe(struct device *dev,