diff options
Diffstat (limited to 'drivers/zorro/zorro.c')
| -rw-r--r-- | drivers/zorro/zorro.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c index 2dda20ac6b36..a1585d6f6486 100644 --- a/drivers/zorro/zorro.c +++ b/drivers/zorro/zorro.c | |||
| @@ -165,10 +165,8 @@ static int __init zorro_init(void) | |||
| 165 | zorro_name_device(z); | 165 | zorro_name_device(z); |
| 166 | z->resource.name = z->name; | 166 | z->resource.name = z->name; |
| 167 | if (request_resource(zorro_find_parent_resource(z), &z->resource)) | 167 | if (request_resource(zorro_find_parent_resource(z), &z->resource)) |
| 168 | printk(KERN_ERR "Zorro: Address space collision on device %s " | 168 | pr_err("Zorro: Address space collision on device %s %pR\n", |
| 169 | "[%lx:%lx]\n", | 169 | z->name, &z->resource); |
| 170 | z->name, (unsigned long)zorro_resource_start(z), | ||
| 171 | (unsigned long)zorro_resource_end(z)); | ||
| 172 | sprintf(z->dev.bus_id, "%02x", i); | 170 | sprintf(z->dev.bus_id, "%02x", i); |
| 173 | z->dev.parent = &zorro_bus.dev; | 171 | z->dev.parent = &zorro_bus.dev; |
| 174 | z->dev.bus = &zorro_bus_type; | 172 | z->dev.bus = &zorro_bus_type; |