fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/mtd/maps/solutionengine.c b/drivers/mtd/maps/solutionengine.c
index 9b2eebe..d76ceef 100644 (file)
--- a/drivers/mtd/maps/solutionengine.c
+++ b/drivers/mtd/maps/solutionengine.c
@@ -1,5 +1,5 @@
 /*
- * $Id: solutionengine.c,v 1.13 2004/07/12 21:59:45 dwmw2 Exp $
+ * $Id: solutionengine.c,v 1.15 2005/11/07 11:14:28 gleixner Exp $
  *
  * Flash and EPROM on Hitachi Solution Engine and similar boards.
  *
@@ -16,7 +16,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
-#include <linux/config.h>
 #include <linux/errno.h>
 
 static struct mtd_info *flash_mtd;
@@ -62,12 +61,12 @@ static int __init init_soleng_maps(void)
 
        /* First probe at offset 0 */
        soleng_flash_map.phys = 0;
-       soleng_flash_map.virt = P2SEGADDR(0);
+       soleng_flash_map.virt = (void __iomem *)P2SEGADDR(0);
        soleng_eprom_map.phys = 0x01000000;
-       soleng_eprom_map.virt = P1SEGADDR(0x01000000);
+       soleng_eprom_map.virt = (void __iomem *)P1SEGADDR(0x01000000);
        simple_map_init(&soleng_eprom_map);
        simple_map_init(&soleng_flash_map);
-       
+
        printk(KERN_NOTICE "Probing for flash chips at 0x00000000:\n");
        flash_mtd = do_map_probe("cfi_probe", &soleng_flash_map);
        if (!flash_mtd) {