vserver 1.9.3

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

diff --git a/drivers/mtd/maps/uclinux.c b/drivers/mtd/maps/uclinux.c
index f722390..baff49b 100644 (file)
--- a/drivers/mtd/maps/uclinux.c
+++ b/drivers/mtd/maps/uclinux.c
@@ -5,7 +5,7 @@
  *
  *     (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
  *
- *     $Id: uclinux.c,v 1.5 2003/05/20 20:59:32 dwmw2 Exp $
+ *     $Id: uclinux.c,v 1.7 2004/07/12 21:59:45 dwmw2 Exp $
  */
 
 /****************************************************************************/
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/fs.h>
 #include <linux/major.h>
+#include <linux/root_dev.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
@@ -63,15 +64,14 @@ int __init uclinux_mtd_init(void)
        mapp = &uclinux_ram_map;
        mapp->phys = (unsigned long) &_ebss;
        mapp->size = PAGE_ALIGN(*((unsigned long *)((&_ebss) + 8)));
-       mapp->buswidth = 4;
+       mapp->bankwidth = 4;
 
        printk("uclinux[mtd]: RAM probe address=0x%x size=0x%x\n",
                (int) mapp->map_priv_2, (int) mapp->size);
 
-       mapp->virt = (unsigned long)
-               ioremap_nocache(mapp->phys, mapp->size);
+       mapp->virt = ioremap_nocache(mapp->phys, mapp->size);
 
-       if (mapp->virt == 0) {
+       if (!mapp->virt) {
                printk("uclinux[mtd]: ioremap_nocache() failed\n");
                return(-EIO);
        }
@@ -81,7 +81,7 @@ int __init uclinux_mtd_init(void)
        mtd = do_map_probe("map_ram", mapp);
        if (!mtd) {
                printk("uclinux[mtd]: failed to find a mapping?\n");
-               iounmap((void *) mapp->virt);
+               iounmap(mapp->virt);
                return(-ENXIO);
        }