This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c
index a6014b6..38a8146 100644 (file)
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
@@ -6,7 +6,7 @@
  *      (C) Copyright 2000-2001, Greg Ungerer (gerg@snapgear.com)
  *      (C) Copyright 2001-2002, SnapGear (www.snapgear.com)
  *
- *     $Id: nettel.c,v 1.8 2004/11/04 13:24:15 gleixner Exp $
+ *     $Id: nettel.c,v 1.5 2004/07/12 21:59:44 dwmw2 Exp $
  */
 
 /****************************************************************************/
@@ -273,7 +273,8 @@ int __init nettel_init(void)
        __asm__ ("wbinvd");
 
        nettel_amd_map.phys = amdaddr;
-       nettel_amd_map.virt = ioremap_nocache(amdaddr, maxsize);
+       nettel_amd_map.virt = (unsigned long)
+               ioremap_nocache(amdaddr, maxsize);
        if (!nettel_amd_map.virt) {
                printk("SNAPGEAR: failed to ioremap() BOOTCS\n");
                return(-EIO);
@@ -471,8 +472,8 @@ void __exit nettel_cleanup(void)
                map_destroy(amd_mtd);
        }
        if (nettel_amd_map.virt) {
-               iounmap(nettel_amd_map.virt);
-               nettel_amd_map.virt = NULL;
+               iounmap((void *)nettel_amd_map.virt);
+               nettel_amd_map.virt = 0;
        }
 #ifdef CONFIG_MTD_CFI_INTELEXT
        if (intel_mtd) {