Merge branches 'x86/prototypes', 'x86/x2apic' and 'x86/debug' into x86/core

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

diff --git a/drivers/mtd/maps/sc520cdp.c b/drivers/mtd/maps/sc520cdp.c
index 9b50cfc..85c1e56 100644 (file)
--- a/drivers/mtd/maps/sc520cdp.c
+++ b/drivers/mtd/maps/sc520cdp.c
@@ -16,8 +16,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: sc520cdp.c,v 1.23 2005/11/17 08:20:27 dwmw2 Exp $
- *
  *
  * The SC520CDP is an evaluation board for the Elan SC520 processor available
  * from AMD. It has two banks of 32-bit Flash ROM, each 8 Megabytes in size,
@@ -237,8 +235,9 @@ static int __init init_sc520cdp(void)
 #endif
 
        for (i = 0; i < NUM_FLASH_BANKS; i++) {
-               printk(KERN_NOTICE "SC520 CDP flash device: 0x%lx at 0x%lx\n",
-                      sc520cdp_map[i].size, sc520cdp_map[i].phys);
+               printk(KERN_NOTICE "SC520 CDP flash device: 0x%Lx at 0x%Lx\n",
+                       (unsigned long long)sc520cdp_map[i].size,
+                       (unsigned long long)sc520cdp_map[i].phys);
 
                sc520cdp_map[i].virt = ioremap_nocache(sc520cdp_map[i].phys, sc520cdp_map[i].size);