Merge branch 'linux-2.6'

1 files changed, 3 insertions, 2 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) {