mtd/drivers/mtd/maps sa1100-flash.c,1.43,1.44

[Russell King]

Update of /home/cvs/mtd/drivers/mtd/maps
In directory phoenix.infradead.org:/tmp/cvs-serv4445

Modified Files:
	sa1100-flash.c 
Log Message:
Name individual flash mappings separately

Index: sa1100-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sa1100-flash.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sa1100-flash.c	21 Oct 2004 12:20:55 -0000	1.43
+++ sa1100-flash.c	21 Oct 2004 12:24:33 -0000	1.44
@@ -917,7 +917,8 @@
 	unsigned long base;
 	unsigned long size;
 	int width;
-        void (*set_vpp)(struct map_info *, int);
+	void (*set_vpp)(struct map_info *, int);
+	char name[16];
 	struct map_info *map;
 	struct mtd_info *mtd;
 	struct resource *res;
@@ -949,14 +950,16 @@
 		if (sa[i].base == (unsigned long)-1)
 			break;
 
-		sa[i].res = request_mem_region(sa[i].base, sa[i].size, "sa1100 flash");
+		sa[i].map = maps + i;
+		sa[i].map->name = sa[i].name;
+		sprintf(sa[i].name, "sa1100-%d", i);
+
+		sa[i].res = request_mem_region(sa[i].base, sa[i].size, sa[i].name);
 		if (!sa[i].res) {
 			ret = -EBUSY;
 			break;
 		}
 
-		sa[i].map = maps + i;
-
 		sa[i].map->virt = ioremap(sa[i].base, sa[i].size);
 		if (!sa[i].map->virt) {
 			ret = -ENOMEM;
@@ -1016,7 +1019,7 @@
 			 */
 #ifdef CONFIG_MTD_CONCAT
 			*rmtd = mtd_concat_create(subdev, found,
-						  "sa1100 flash");
+						  "sa1100");
 			if (*rmtd == NULL)
 				ret = -ENXIO;
 #else