Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/mtd/maps/dbox2-flash.c b/drivers/mtd/maps/dbox2-flash.c
index d850a27..652813c 100644 (file)
--- a/drivers/mtd/maps/dbox2-flash.c
+++ b/drivers/mtd/maps/dbox2-flash.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbox2-flash.c,v 1.13 2004/11/04 13:24:14 gleixner Exp $
+ * $Id: dbox2-flash.c,v 1.14 2005/11/07 11:14:26 gleixner Exp $
  *
  * D-Box 2 flash driver
  */
@@ -21,43 +21,43 @@
 static struct mtd_partition partition_info[]= {
        {
        .name           = "BR bootloader",
-       .size           = 128 * 1024, 
-       .offset         = 0,                  
+       .size           = 128 * 1024,
+       .offset         = 0,
        .mask_flags     = MTD_WRITEABLE
        },
        {
        .name           = "FLFS (U-Boot)",
-       .size           = 128 * 1024, 
-       .offset         = MTDPART_OFS_APPEND, 
+       .size           = 128 * 1024,
+       .offset         = MTDPART_OFS_APPEND,
        .mask_flags     = 0
        },
        {
-       .name           = "Root (SquashFS)",    
-       .size           = 7040 * 1024, 
-       .offset         = MTDPART_OFS_APPEND, 
+       .name           = "Root (SquashFS)",
+       .size           = 7040 * 1024,
+       .offset         = MTDPART_OFS_APPEND,
        .mask_flags     = 0
        },
        {
        .name           = "var (JFFS2)",
-       .size           = 896 * 1024, 
-       .offset         = MTDPART_OFS_APPEND, 
+       .size           = 896 * 1024,
+       .offset         = MTDPART_OFS_APPEND,
        .mask_flags     = 0
        },
        {
-       .name           = "Flash without bootloader",   
-       .size           = MTDPART_SIZ_FULL, 
-       .offset         = 128 * 1024, 
+       .name           = "Flash without bootloader",
+       .size           = MTDPART_SIZ_FULL,
+       .offset         = 128 * 1024,
        .mask_flags     = 0
        },
        {
-       .name           = "Complete Flash",     
-       .size           = MTDPART_SIZ_FULL, 
-       .offset         = 0, 
+       .name           = "Complete Flash",
+       .size           = MTDPART_SIZ_FULL,
+       .offset         = 0,
        .mask_flags     = MTD_WRITEABLE
        }
 };
 
-#define NUM_PARTITIONS (sizeof(partition_info) / sizeof(partition_info[0]))
+#define NUM_PARTITIONS ARRAY_SIZE(partition_info)
 
 #define WINDOW_ADDR 0x10000000
 #define WINDOW_SIZE 0x800000
@@ -88,16 +88,16 @@ int __init init_dbox2_flash(void)
        if (!mymtd) {
            // Probe for single Intel 28F640
            dbox2_flash_map.bankwidth = 2;
-       
+
            mymtd = do_map_probe("cfi_probe", &dbox2_flash_map);
        }
-           
+
        if (mymtd) {
                mymtd->owner = THIS_MODULE;
 
                 /* Create MTD devices for each partition. */
                add_mtd_partitions(mymtd, partition_info, NUM_PARTITIONS);
-               
+
                return 0;
        }