Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-microblaze.git] / drivers / acpi / acpi_amba.c

diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/acpi_amba.c
index 49b781a..ab8a4e0 100644 (file)
--- a/drivers/acpi/acpi_amba.c
+++ b/drivers/acpi/acpi_amba.c
@@ -76,6 +76,7 @@ static int amba_handler_attach(struct acpi_device *adev,
                case IORESOURCE_MEM:
                        if (!address_found) {
                                dev->res = *rentry->res;
+                               dev->res.name = dev_name(&dev->dev);
                                address_found = true;
                        }
                        break;