diff options
Diffstat (limited to 'drivers/zorro')
-rw-r--r-- | drivers/zorro/proc.c | 5 | ||||
-rw-r--r-- | drivers/zorro/zorro-sysfs.c | 3 | ||||
-rw-r--r-- | drivers/zorro/zorro.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c index b3ce8859a586..2ce4cebc31d9 100644 --- a/drivers/zorro/proc.c +++ b/drivers/zorro/proc.c | |||
@@ -90,8 +90,9 @@ get_zorro_dev_info(char *buf, char **start, off_t pos, int count) | |||
90 | for (slot = cnt = 0; slot < zorro_num_autocon && count > cnt; slot++) { | 90 | for (slot = cnt = 0; slot < zorro_num_autocon && count > cnt; slot++) { |
91 | struct zorro_dev *z = &zorro_autocon[slot]; | 91 | struct zorro_dev *z = &zorro_autocon[slot]; |
92 | len = sprintf(buf, "%02x\t%08x\t%08lx\t%08lx\t%02x\n", slot, | 92 | len = sprintf(buf, "%02x\t%08x\t%08lx\t%08lx\t%02x\n", slot, |
93 | z->id, zorro_resource_start(z), | 93 | z->id, (unsigned long)zorro_resource_start(z), |
94 | zorro_resource_len(z), z->rom.er_Type); | 94 | (unsigned long)zorro_resource_len(z), |
95 | z->rom.er_Type); | ||
95 | at += len; | 96 | at += len; |
96 | if (at >= pos) { | 97 | if (at >= pos) { |
97 | if (!*start) { | 98 | if (!*start) { |
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c index 87c29d7b6c17..c3ba0ec334c4 100644 --- a/drivers/zorro/zorro-sysfs.c +++ b/drivers/zorro/zorro-sysfs.c | |||
@@ -42,7 +42,8 @@ static ssize_t zorro_show_resource(struct device *dev, struct device_attribute * | |||
42 | struct zorro_dev *z = to_zorro_dev(dev); | 42 | struct zorro_dev *z = to_zorro_dev(dev); |
43 | 43 | ||
44 | return sprintf(buf, "0x%08lx 0x%08lx 0x%08lx\n", | 44 | return sprintf(buf, "0x%08lx 0x%08lx 0x%08lx\n", |
45 | zorro_resource_start(z), zorro_resource_end(z), | 45 | (unsigned long)zorro_resource_start(z), |
46 | (unsigned long)zorro_resource_end(z), | ||
46 | zorro_resource_flags(z)); | 47 | zorro_resource_flags(z)); |
47 | } | 48 | } |
48 | 49 | ||
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c index 0f2b40605b06..4cc42b64820c 100644 --- a/drivers/zorro/zorro.c +++ b/drivers/zorro/zorro.c | |||
@@ -164,7 +164,8 @@ static int __init zorro_init(void) | |||
164 | if (request_resource(zorro_find_parent_resource(z), &z->resource)) | 164 | if (request_resource(zorro_find_parent_resource(z), &z->resource)) |
165 | printk(KERN_ERR "Zorro: Address space collision on device %s " | 165 | printk(KERN_ERR "Zorro: Address space collision on device %s " |
166 | "[%lx:%lx]\n", | 166 | "[%lx:%lx]\n", |
167 | z->name, zorro_resource_start(z), zorro_resource_end(z)); | 167 | z->name, (unsigned long)zorro_resource_start(z), |
168 | (unsigned long)zorro_resource_end(z)); | ||
168 | sprintf(z->dev.bus_id, "%02x", i); | 169 | sprintf(z->dev.bus_id, "%02x", i); |
169 | z->dev.parent = &zorro_bus.dev; | 170 | z->dev.parent = &zorro_bus.dev; |
170 | z->dev.bus = &zorro_bus_type; | 171 | z->dev.bus = &zorro_bus_type; |