linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / mtd / maps / scx200_docflash.c

diff --git a/drivers/mtd/maps/scx200_docflash.c b/drivers/mtd/maps/scx200_docflash.c
index 7391fd5..2c91dff 100644 (file)
--- 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)