Merge commit 'v2.6.27-rc6' into timers/hpet

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

diff --git a/drivers/mtd/maps/dilnetpc.c b/drivers/mtd/maps/dilnetpc.c
index b1104fe1f20723a4dfaca7400efc6d0e85bdab0b..0713e3a5a22cb4b4bf1baa1db4c5d57d01259e13 100644 (file)
--- a/drivers/mtd/maps/dilnetpc.c
+++ b/drivers/mtd/maps/dilnetpc.c
@@ -14,8 +14,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- * $Id: dilnetpc.c,v 1.20 2005/11/07 11:14:26 gleixner Exp $
- *
  * The DIL/Net PC is a tiny embedded PC board made by SSV Embedded Systems
  * featuring the AMD Elan SC410 processor. There are two variants of this
  * board: DNP/1486 and ADNP/1486. The DNP version has 2 megs of flash
@@ -402,8 +400,8 @@ static int __init init_dnpc(void)
                        ++higlvl_partition_info[i].name;
        }
 
-       printk(KERN_NOTICE "DIL/Net %s flash: 0x%lx at 0x%lx\n",
-               is_dnp ? "DNPC" : "ADNP", dnpc_map.size, dnpc_map.phys);
+       printk(KERN_NOTICE "DIL/Net %s flash: 0x%lx at 0x%llx\n",
+               is_dnp ? "DNPC" : "ADNP", dnpc_map.size, (unsigned long long)dnpc_map.phys);
 
        dnpc_map.virt = ioremap_nocache(dnpc_map.phys, dnpc_map.size);