Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[karo-tx-linux.git] / drivers / mtd / maps / nettel.c

diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c
index a8723a6b74574a74e1e00b08f88b3c3e8ba3bdcb..a97133eb9d70ec8356e991d3a63fb888000d4c31 100644 (file)
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
@@ -357,13 +357,12 @@ static int __init nettel_init(void)
                *intel1par = 0;
        }
 
-       printk(KERN_NOTICE "SNAPGEAR: Intel flash device size = %dK\n",
-               (intel_mtd->size >> 10));
+       printk(KERN_NOTICE "SNAPGEAR: Intel flash device size = %lldKiB\n",
+              (unsigned long long)(intel_mtd->size >> 10));
 
        intel_mtd->owner = THIS_MODULE;
 
-       num_intel_partitions = sizeof(nettel_intel_partitions) /
-               sizeof(nettel_intel_partitions[0]);
+       num_intel_partitions = ARRAY_SIZE(nettel_intel_partitions);
 
        if (intelboot) {
                /*