Merge branch 'acpi-ec'

[linux-drm-fsl-dcu.git] / drivers / acpi / acpi_platform.c

diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 6ba8beb6b9d2a515828c3987393dc75fa8b6bc2c..1284138e42ab486d584f61e3f90bbaf0320a1a5b 100644 (file)
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -45,7 +45,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
        struct platform_device *pdev = NULL;
        struct acpi_device *acpi_parent;
        struct platform_device_info pdevinfo;
-       struct resource_list_entry *rentry;
+       struct resource_entry *rentry;
        struct list_head resource_list;
        struct resource *resources = NULL;
        int count;
@@ -71,7 +71,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
                }
                count = 0;
                list_for_each_entry(rentry, &resource_list, node)
-                       resources[count++] = rentry->res;
+                       resources[count++] = *rentry->res;
 
                acpi_dev_free_resource_list(&resource_list);
        }