vserver 1.9.3

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

diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c
index 5607a29..5a10fba 100644 (file)
--- a/drivers/mtd/maps/tqm8xxl.c
+++ b/drivers/mtd/maps/tqm8xxl.c
@@ -2,7 +2,7 @@
  * Handle mapping of the flash memory access routines 
  * on TQM8xxL based devices.
  *
- * $Id: tqm8xxl.c,v 1.9 2003/06/23 11:48:18 dwmw2 Exp $
+ * $Id: tqm8xxl.c,v 1.11 2004/07/12 21:59:45 dwmw2 Exp $
  *
  * based on rpxlite.c
  *
@@ -50,7 +50,7 @@ static struct mtd_info* mtd_banks[FLASH_BANK_MAX];
 static struct map_info* map_banks[FLASH_BANK_MAX];
 static struct mtd_part_def part_banks[FLASH_BANK_MAX];
 static unsigned long num_banks;
-static unsigned long start_scan_addr;
+static void __iomem *start_scan_addr;
 
 /*
  * Here are partition information for all known TQM8xxL series devices.
@@ -105,7 +105,7 @@ static struct mtd_partition tqm8xxl_fs_partitions[] = {
          .name = "jffs",
          .offset = 0x00200000,
          .size = 0x00200000,
-         .//size = MTDPART_SIZ_FULL,
+         //.size = MTDPART_SIZ_FULL,
        }
 };
 #endif
@@ -121,7 +121,7 @@ int __init init_tqm_mtd(void)
        flash_size = bd->bi_flashsize;
 
        //request maximum flash size address space
-       start_scan_addr = (unsigned long)ioremap(flash_addr, flash_size);
+       start_scan_addr = ioremap(flash_addr, flash_size);
        if (!start_scan_addr) {
                printk(KERN_WARNING "%s:Failed to ioremap address:0x%x\n", __FUNCTION__, flash_addr);
                return -EIO;
@@ -151,7 +151,7 @@ int __init init_tqm_mtd(void)
                sprintf(map_banks[idx]->name, "TQM8xxL%d", idx);
 
                map_banks[idx]->size = flash_size;
-               map_banks[idx]->buswidth = 4;
+               map_banks[idx]->bankwidth = 4;
 
                simple_map_init(map_banks[idx]);
 
@@ -231,7 +231,7 @@ error_mem:
                }
        }
 error:
-       iounmap((void *)start_scan_addr);
+       iounmap(start_scan_addr);
        return ret;
 }
 
@@ -250,7 +250,7 @@ static void __exit cleanup_tqm_mtd(void)
        }
 
        if (start_scan_addr) {
-               iounmap((void *)start_scan_addr);
+               iounmap(start_scan_addr);
                start_scan_addr = 0;
        }
 }