Merge branches 'release' and 'wmi-2.6.25' into release

[linux-2.6-omap-h63xx.git] / drivers / mtd / maps / ichxrom.c

diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c
index 2bb3e63606e5df9e343a87a81f1fe9a9e412bd04..2c884c49e84a5cd5f0bb1a50e8fc285bb408ceb3 100644 (file)
--- a/drivers/mtd/maps/ichxrom.c
+++ b/drivers/mtd/maps/ichxrom.c
@@ -227,8 +227,8 @@ static int __devinit ichxrom_init_one (struct pci_dev *pdev,
                        (((unsigned long)(window->virt)) + offset);
                map->map.size = 0xffffffffUL - map_top + 1UL;
                /* Set the name of the map to the address I am trying */
-               sprintf(map->map_name, "%s @%08lx",
-                       MOD_NAME, map->map.phys);
+               sprintf(map->map_name, "%s @%08Lx",
+                       MOD_NAME, (unsigned long long)map->map.phys);
 
                /* Firmware hubs only use vpp when being programmed
                 * in a factory setting.  So in-place programming