Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 53301
b: refs/heads/master
c: 3181757
h: refs/heads/master
i:
  53299: 32c1c13
v: v3
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed May 5, 2007
1 parent 60472b8 commit 450c3dd
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f4d86754f956ab5ea73aa91759a0d89a2f0e3f2a
refs/heads/master: 318175766e7688ba52cdf771d37e98a1e4759f98
5 changes: 3 additions & 2 deletions trunk/drivers/zorro/proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,9 @@ get_zorro_dev_info(char *buf, char **start, off_t pos, int count)
for (slot = cnt = 0; slot < zorro_num_autocon && count > cnt; slot++) {
struct zorro_dev *z = &zorro_autocon[slot];
len = sprintf(buf, "%02x\t%08x\t%08lx\t%08lx\t%02x\n", slot,
z->id, zorro_resource_start(z),
zorro_resource_len(z), z->rom.er_Type);
z->id, (unsigned long)zorro_resource_start(z),
(unsigned long)zorro_resource_len(z),
z->rom.er_Type);
at += len;
if (at >= pos) {
if (!*start) {
Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/zorro/zorro-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ static ssize_t zorro_show_resource(struct device *dev, struct device_attribute *
struct zorro_dev *z = to_zorro_dev(dev);

return sprintf(buf, "0x%08lx 0x%08lx 0x%08lx\n",
zorro_resource_start(z), zorro_resource_end(z),
(unsigned long)zorro_resource_start(z),
(unsigned long)zorro_resource_end(z),
zorro_resource_flags(z));
}

Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/zorro/zorro.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ static int __init zorro_init(void)
if (request_resource(zorro_find_parent_resource(z), &z->resource))
printk(KERN_ERR "Zorro: Address space collision on device %s "
"[%lx:%lx]\n",
z->name, zorro_resource_start(z), zorro_resource_end(z));
z->name, (unsigned long)zorro_resource_start(z),
(unsigned long)zorro_resource_end(z));
sprintf(z->dev.bus_id, "%02x", i);
z->dev.parent = &zorro_bus.dev;
z->dev.bus = &zorro_bus_type;
Expand Down

0 comments on commit 450c3dd

Please sign in to comment.