X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmtd%2Fmaps%2Fscx200_docflash.c;fp=drivers%2Fmtd%2Fmaps%2Fscx200_docflash.c;h=2c91dff8bb60c881e015d9e8e6d53b6bba3c669c;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=7391fd544e86fc7351e46fb4efa209afe31fbb25;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/mtd/maps/scx200_docflash.c b/drivers/mtd/maps/scx200_docflash.c
index 7391fd544..2c91dff8b 100644
--- a/drivers/mtd/maps/scx200_docflash.c
+++ b/drivers/mtd/maps/scx200_docflash.c
@@ -8,6 +8,7 @@
 */
 
 #include <linux/module.h>
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -69,7 +70,7 @@ static struct mtd_partition partition_info[] = {
 		.size   = 0x80000
 	},
 };
-#define NUM_PARTITIONS ARRAY_SIZE(partition_info)
+#define NUM_PARTITIONS (sizeof(partition_info)/sizeof(partition_info[0]))
 #endif
 
 
@@ -163,9 +164,8 @@ static int __init init_scx200_docflash(void)
 		outl(pmr, scx200_cb_base + SCx200_PMR);
 	}
 
-       	printk(KERN_INFO NAME ": DOCCS mapped at 0x%llx-0x%llx, width %d\n",
-			(unsigned long long)docmem.start,
-			(unsigned long long)docmem.end, width);
+       	printk(KERN_INFO NAME ": DOCCS mapped at 0x%lx-0x%lx, width %d\n",
+	       docmem.start, docmem.end, width);
 
 	scx200_docflash_map.size = size;
 	if (width == 8)