vserver 1.9.3

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

diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c
index 01b867c..e34420b 100644 (file)
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
@@ -11,7 +11,7 @@
  *
  * (C) 2000 Nicolas Pitre <nico@cam.org>
  *
- * $Id: ceiva.c,v 1.8 2003/05/21 12:45:18 dwmw2 Exp $
+ * $Id: ceiva.c,v 1.10 2004/07/12 21:59:43 dwmw2 Exp $
  */
 
 #include <linux/config.h>
@@ -103,7 +103,7 @@ struct clps_info {
        unsigned long base;
        unsigned long size;
        int width;
-       void *vbase;
+       void __iomem *vbase;
        struct map_info *map;
        struct mtd_info *mtd;
        struct resource *res;
@@ -150,8 +150,8 @@ static int __init clps_setup_mtd(struct clps_info *clps, int nr, struct mtd_info
                        break;
                }
 
-               clps[i].map->virt = (unsigned long)clps[i].vbase;
-               clps[i].map->buswidth = clps[i].width;
+               clps[i].map->virt = clps[i].vbase;
+               clps[i].map->bankwidth = clps[i].width;
                clps[i].map->size = clps[i].size;
 
                simple_map_init(&clps[i].map);