6 files changed, 14 insertions, 12 deletions

diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index d1eec7d3243f..237733d094c4 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -232,8 +232,8 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
                 /* Trim the size if we are larger than the map */
                 if (map->mtd->size > map->map.size) {
                         printk(KERN_WARNING MOD_NAME
-                                " rom(%u) larger than window(%lu). fixing...\n",
-                                map->mtd->size, map->map.size);
+                                " rom(%llu) larger than window(%lu). fixing...\n",
+                                (unsigned long long)map->mtd->size, map->map.size);
                         map->mtd->size = map->map.size;
                 }
                 if (window->rsrc.parent) {
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index 1a6feb4474de..5f7a245ed132 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -263,8 +263,8 @@ static int __devinit ck804xrom_init_one (struct pci_dev *pdev,
                 /* Trim the size if we are larger than the map */
                 if (map->mtd->size > map->map.size) {
                         printk(KERN_WARNING MOD_NAME
-                                " rom(%u) larger than window(%lu). fixing...\n",
-                                map->mtd->size, map->map.size);
+                                " rom(%llu) larger than window(%lu). fixing...\n",
+                                (unsigned long long)map->mtd->size, map->map.size);
                         map->mtd->size = map->map.size;
                 }
                 if (window->rsrc.parent) {
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c
index bbbcdd4c8d13..11a2f57df9cf 100644
--- a/drivers/mtd/maps/esb2rom.c
+++ b/drivers/mtd/maps/esb2rom.c
@@ -324,8 +324,8 @@ static int __devinit esb2rom_init_one(struct pci_dev *pdev,
                 /* Trim the size if we are larger than the map */
                 if (map->mtd->size > map->map.size) {
                         printk(KERN_WARNING MOD_NAME
-                                " rom(%u) larger than window(%lu). fixing...\n",
-                                map->mtd->size, map->map.size);
+                                " rom(%llu) larger than window(%lu). fixing...\n",
+                                (unsigned long long)map->mtd->size, map->map.size);
                         map->mtd->size = map->map.size;
                 }
                 if (window->rsrc.parent) {
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
index aeb6c916e23f..c32bc28920b3 100644
--- a/drivers/mtd/maps/ichxrom.c
+++ b/drivers/mtd/maps/ichxrom.c
@@ -258,8 +258,8 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
                 /* Trim the size if we are larger than the map */
                 if (map->mtd->size > map->map.size) {
                         printk(KERN_WARNING MOD_NAME
-                                " rom(%u) larger than window(%lu). fixing...\n",
-                                map->mtd->size, map->map.size);
+                                " rom(%llu) larger than window(%lu). fixing...\n",
+                                (unsigned long long)map->mtd->size, map->map.size);
                         map->mtd->size = map->map.size;
                 }
                 if (window->rsrc.parent) {
diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c
index 965e6c6d6ab0..a8723a6b7457 100644
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
@@ -226,7 +226,7 @@ static int __init nettel_init(void)
 
         if ((amd_mtd = do_map_probe("jedec_probe", &nettel_amd_map))) {
                 printk(KERN_NOTICE "SNAPGEAR: AMD flash device size = %dK\n",
-                        amd_mtd->size>>10);
+                        (int)(amd_mtd->size>>10));
 
                 amd_mtd->owner = THIS_MODULE;
 
diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c
index 21169e6d646c..7e329f09a548 100644
--- a/drivers/mtd/maps/scb2_flash.c
+++ b/drivers/mtd/maps/scb2_flash.c
@@ -118,7 +118,8 @@ scb2_fixup_mtd(struct mtd_info *mtd)
                 struct mtd_erase_region_info *region = &mtd->eraseregions[i];
 
                 if (region->numblocks * region->erasesize > mtd->size) {
-                        region->numblocks = (mtd->size / region->erasesize);
+                        region->numblocks = ((unsigned long)mtd->size /
+                                                region->erasesize);
                         done = 1;
                 } else {
                         region->numblocks = 0;
@@ -187,8 +188,9 @@ scb2_flash_probe(struct pci_dev *dev, const struct pci_device_id *ent)
                 return -ENODEV;
         }
 
-        printk(KERN_NOTICE MODNAME ": chip size 0x%x at offset 0x%x\n",
-               scb2_mtd->size, SCB2_WINDOW - scb2_mtd->size);
+        printk(KERN_NOTICE MODNAME ": chip size 0x%llx at offset 0x%llx\n",
+               (unsigned long long)scb2_mtd->size,
+               (unsigned long long)(SCB2_WINDOW - scb2_mtd->size));
 
         add_mtd_device(scb2_mtd);