Merge branches 'acpi-ec', 'acpi-soc', 'acpi-video' and 'acpi-resources'

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

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 6bb8d3574ec68718ca8c17e2f5d32e36a9c5e4a9..657964e8ab7ed2ba9e56004d5f83881ad826e7b7 100644 (file)
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -322,7 +322,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
 {
        struct lpss_device_desc *dev_desc;
        struct lpss_private_data *pdata;
-       struct resource_list_entry *rentry;
+       struct resource_entry *rentry;
        struct list_head resource_list;
        struct platform_device *pdev;
        int ret;
@@ -342,12 +342,12 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
                goto err_out;
 
        list_for_each_entry(rentry, &resource_list, node)
-               if (resource_type(&rentry->res) == IORESOURCE_MEM) {
+               if (resource_type(rentry->res) == IORESOURCE_MEM) {
                        if (dev_desc->prv_size_override)
                                pdata->mmio_size = dev_desc->prv_size_override;
                        else
-                               pdata->mmio_size = resource_size(&rentry->res);
-                       pdata->mmio_base = ioremap(rentry->res.start,
+                               pdata->mmio_size = resource_size(rentry->res);
+                       pdata->mmio_base = ioremap(rentry->res->start,
                                                   pdata->mmio_size);
                        if (!pdata->mmio_base)
                                goto err_out;