From 450c3ddda6e1ff12b6f7f031a191eb1132805838 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 1 May 2007 22:33:04 +0200
Subject: [PATCH] --- yaml --- r: 53301 b: refs/heads/master c:
 318175766e7688ba52cdf771d37e98a1e4759f98 h: refs/heads/master i:   53299:
 32c1c135602ac304569972357c7863dfaa0cf55e v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/zorro/proc.c        | 5 +++--
 trunk/drivers/zorro/zorro-sysfs.c | 3 ++-
 trunk/drivers/zorro/zorro.c       | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c76491440ff1..fc038d8e5949 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4d86754f956ab5ea73aa91759a0d89a2f0e3f2a
+refs/heads/master: 318175766e7688ba52cdf771d37e98a1e4759f98
diff --git a/trunk/drivers/zorro/proc.c b/trunk/drivers/zorro/proc.c
index b3ce8859a586..2ce4cebc31d9 100644
--- a/trunk/drivers/zorro/proc.c
+++ b/trunk/drivers/zorro/proc.c
@@ -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) {
diff --git a/trunk/drivers/zorro/zorro-sysfs.c b/trunk/drivers/zorro/zorro-sysfs.c
index 87c29d7b6c17..c3ba0ec334c4 100644
--- a/trunk/drivers/zorro/zorro-sysfs.c
+++ b/trunk/drivers/zorro/zorro-sysfs.c
@@ -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));
 }
 
diff --git a/trunk/drivers/zorro/zorro.c b/trunk/drivers/zorro/zorro.c
index 0f2b40605b06..4cc42b64820c 100644
--- a/trunk/drivers/zorro/zorro.c
+++ b/trunk/drivers/zorro/zorro.c
@@ -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;