linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / mtd / chips / amd_flash.c

diff --git a/drivers/mtd/chips/amd_flash.c b/drivers/mtd/chips/amd_flash.c
index 16eaca6..fdb91b6 100644 (file)
--- a/drivers/mtd/chips/amd_flash.c
+++ b/drivers/mtd/chips/amd_flash.c
@@ -97,6 +97,7 @@ struct amd_flash_private {
        int interleave;
        int numchips;
        unsigned long chipshift;
+//     const char *im_name;
        struct flchip chips[0];
 };
 
@@ -130,6 +131,12 @@ static struct mtd_chip_driver amd_flash_chipdrv = {
        .module = THIS_MODULE
 };
 
+
+
+static const char im_name[] = "amd_flash";
+
+
+
 static inline __u32 wide_read(struct map_info *map, __u32 addr)
 {
        if (map->buswidth == 1) {
@@ -657,7 +664,7 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
        printk("%s: Probing for AMD compatible flash...\n", map->name);
 
        if ((table_pos[0] = probe_new_chip(mtd, 0, NULL, &temp, table,
-                                          ARRAY_SIZE(table)))
+                                          sizeof(table)/sizeof(table[0])))
            == -1) {
                printk(KERN_WARNING
                       "%s: Found no AMD compatible device at location zero\n",
@@ -689,7 +696,7 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
             base += (1 << temp.chipshift)) {
                int numchips = temp.numchips;
                table_pos[numchips] = probe_new_chip(mtd, base, chips,
-                       &temp, table, ARRAY_SIZE(table));
+                       &temp, table, sizeof(table)/sizeof(table[0]));
        }
 
        mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info) *
@@ -730,7 +737,6 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
                offset += dev_size;
        }
        mtd->type = MTD_NORFLASH;
-       mtd->writesize = 1;
        mtd->flags = MTD_CAP_NORFLASH;
        mtd->name = map->name;
        mtd->erase = amd_flash_erase;