This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/mtd/maps/scx200_docflash.c b/drivers/mtd/maps/scx200_docflash.c
index d07ddf6..58855a1 100644 (file)
--- a/drivers/mtd/maps/scx200_docflash.c
+++ b/drivers/mtd/maps/scx200_docflash.c
@@ -2,7 +2,7 @@
 
    Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
 
-   $Id: scx200_docflash.c,v 1.9 2004/11/16 18:29:02 dwmw2 Exp $ 
+   $Id: scx200_docflash.c,v 1.6 2004/07/12 21:59:45 dwmw2 Exp $ 
 
    National Semiconductor SCx200 flash mapped with DOCCS
 */
@@ -81,7 +81,7 @@ static struct map_info scx200_docflash_map = {
        .name      = "NatSemi SCx200 DOCCS Flash",
 };
 
-static int __init init_scx200_docflash(void)
+int __init init_scx200_docflash(void)
 {
        unsigned u;
        unsigned base;
@@ -180,7 +180,7 @@ static int __init init_scx200_docflash(void)
        simple_map_init(&scx200_docflash_map);
 
        scx200_docflash_map.phys = docmem.start;
-       scx200_docflash_map.virt = ioremap(docmem.start, scx200_docflash_map.size);
+       scx200_docflash_map.virt = (unsigned long)ioremap(docmem.start, scx200_docflash_map.size);
        if (!scx200_docflash_map.virt) {
                printk(KERN_ERR NAME ": failed to ioremap the flash\n");
                release_resource(&docmem);
@@ -190,7 +190,7 @@ static int __init init_scx200_docflash(void)
        mymtd = do_map_probe(flashtype, &scx200_docflash_map);
        if (!mymtd) {
                printk(KERN_ERR NAME ": unable to detect flash\n");
-               iounmap(scx200_docflash_map.virt);
+               iounmap((void *)scx200_docflash_map.virt);
                release_resource(&docmem);
                return -ENXIO;
        }
@@ -221,7 +221,7 @@ static void __exit cleanup_scx200_docflash(void)
                map_destroy(mymtd);
        }
        if (scx200_docflash_map.virt) {
-               iounmap(scx200_docflash_map.virt);
+               iounmap((void *)scx200_docflash_map.virt);
                release_resource(&docmem);
        }
 }