--- cfi_cmdset_0002.c~	Thu Oct 23 07:27:59 2003
+++ cfi_cmdset_0002.c	Thu Nov 20 14:24:28 2003
@@ -278,6 +278,9 @@
 	struct mtd_info *mtd;
 	unsigned long devsize = (1<<cfi->cfiq->DevSize) * cfi->interleave;
 
+	unsigned long offset = 0;
+	int i,j;
+
 	mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
 	printk(KERN_NOTICE "number of %s chips: %d\n", 
 	       (cfi->cfi_mode == CFI_MODE_CFI)?"CFI":"JEDEC",cfi->numchips);
@@ -292,9 +295,6 @@
 	mtd->type = MTD_NORFLASH;
 	/* Also select the correct geometry setup too */ 
 	mtd->size = devsize * cfi->numchips;
-
-	unsigned long offset = 0;
-	int i,j;
 
 	mtd->numeraseregions = cfi->cfiq->NumEraseRegions * cfi->numchips;
 	mtd->eraseregions = kmalloc(sizeof(struct mtd_erase_region_info)