zorro: Fix address space collision message with RAM expansion boards

[linux-2.6-microblaze.git] / drivers / zorro / zorro.c

diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index 47c7338..1b99286 100644 (file)
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -181,7 +181,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
                z->resource.name = z->name;
                r = zorro_find_parent_resource(pdev, z);
                error = request_resource(r, &z->resource);
-               if (error)
+               if (error && !(z->rom.er_Type & ERTF_MEMLIST))
                        dev_err(&bus->dev,
                                "Address space collision on device %s %pR\n",
                                z->name, &z->resource);