fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / mtd / maps / edb7312.c

diff --git a/drivers/mtd/maps/edb7312.c b/drivers/mtd/maps/edb7312.c
index 842f1b0..1c5b97c 100644 (file)
--- a/drivers/mtd/maps/edb7312.c
+++ b/drivers/mtd/maps/edb7312.c
@@ -1,10 +1,10 @@
 /*
- * $Id: edb7312.c,v 1.11 2004/07/14 09:52:55 dwmw2 Exp $
+ * $Id: edb7312.c,v 1.14 2005/11/07 11:14:27 gleixner Exp $
  *
  * Handle mapping of the NOR flash on Cogent EDB7312 boards
  *
  * Copyright 2002 SYSGO Real-Time Solutions GmbH
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -17,7 +17,6 @@
 #include <asm/io.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
-#include <linux/config.h>
 
 #ifdef CONFIG_MTD_PARTITIONS
 #include <linux/mtd/partitions.h>
@@ -46,7 +45,7 @@ struct map_info edb7312nor_map = {
 #ifdef CONFIG_MTD_PARTITIONS
 
 /*
- * MTD partitioning stuff 
+ * MTD partitioning stuff
  */
 static struct mtd_partition static_partitions[3] =
 {
@@ -80,16 +79,15 @@ int __init init_edb7312nor(void)
        const char **type;
        const char *part_type = 0;
 
-               printk(KERN_NOTICE MSG_PREFIX "0x%08x at 0x%08x\n", 
+               printk(KERN_NOTICE MSG_PREFIX "0x%08x at 0x%08x\n",
               WINDOW_SIZE, WINDOW_ADDR);
-       edb7312nor_map.virt = (unsigned long)
-         ioremap(WINDOW_ADDR, WINDOW_SIZE);
+       edb7312nor_map.virt = ioremap(WINDOW_ADDR, WINDOW_SIZE);
 
        if (!edb7312nor_map.virt) {
                printk(MSG_PREFIX "failed to ioremap\n");
                return -EIO;
        }
-       
+
        simple_map_init(&edb7312nor_map);
 
        mymtd = 0;