Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / drivers / mtd / maps / netsc520.c

diff --git a/drivers/mtd/maps/netsc520.c b/drivers/mtd/maps/netsc520.c
index 33060a3..95dcab2 100644 (file)
--- a/drivers/mtd/maps/netsc520.c
+++ b/drivers/mtd/maps/netsc520.c
@@ -76,7 +76,7 @@ static struct mtd_partition partition_info[]={
            .size = 0x80000
     },
 };
-#define NUM_PARTITIONS (sizeof(partition_info)/sizeof(partition_info[0]))
+#define NUM_PARTITIONS ARRAY_SIZE(partition_info)
 
 #define WINDOW_SIZE    0x00100000
 #define WINDOW_ADDR    0x00200000
@@ -88,13 +88,15 @@ static struct map_info netsc520_map = {
        .phys = WINDOW_ADDR,
 };
 
-#define NUM_FLASH_BANKS        (sizeof(netsc520_map)/sizeof(struct map_info))
+#define NUM_FLASH_BANKS        ARRAY_SIZE(netsc520_map)
 
 static struct mtd_info *mymtd;
 
 static int __init init_netsc520(void)
 {
-       printk(KERN_NOTICE "NetSc520 flash device: 0x%lx at 0x%lx\n", netsc520_map.size, netsc520_map.phys);
+       printk(KERN_NOTICE "NetSc520 flash device: 0x%Lx at 0x%Lx\n",
+                       (unsigned long long)netsc520_map.size,
+                       (unsigned long long)netsc520_map.phys);
        netsc520_map.virt = ioremap_nocache(netsc520_map.phys, netsc520_map.size);
 
        if (!netsc520_map.virt) {