Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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)
         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/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 *
         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/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)
         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;