Merge tag 'powerpc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

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

diff --git a/drivers/mfd/intel-lpss-acpi.c b/drivers/mfd/intel-lpss-acpi.c
index 5a8d9c7666330ace7c30a5133e7bfc7e9b7b88e4..7ddc4a9563ea5ab8e4e52b152ff43a620594d928 100644 (file)
--- a/drivers/mfd/intel-lpss-acpi.c
+++ b/drivers/mfd/intel-lpss-acpi.c
@@ -31,13 +31,9 @@ static struct property_entry spt_i2c_properties[] = {
        { },
 };
 
-static struct property_set spt_i2c_pset = {
-       .properties = spt_i2c_properties,
-};
-
 static const struct intel_lpss_platform_info spt_i2c_info = {
        .clk_rate = 120000000,
-       .pset = &spt_i2c_pset,
+       .properties = spt_i2c_properties,
 };
 
 static const struct intel_lpss_platform_info bxt_info = {
@@ -51,13 +47,9 @@ static struct property_entry bxt_i2c_properties[] = {
        { },
 };
 
-static struct property_set bxt_i2c_pset = {
-       .properties = bxt_i2c_properties,
-};
-
 static const struct intel_lpss_platform_info bxt_i2c_info = {
        .clk_rate = 133000000,
-       .pset = &bxt_i2c_pset,
+       .properties = bxt_i2c_properties,
 };
 
 static const struct acpi_device_id intel_lpss_acpi_ids[] = {