mtd/drivers/mtd/maps lubbock-flash.c,1.4,1.5

[David Woodhouse]

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

Modified Files:
	lubbock-flash.c 
Log Message:
Update to new partition probe registration

Index: lubbock-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/lubbock-flash.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lubbock-flash.c	14 May 2003 22:26:30 -0000	1.4
+++ lubbock-flash.c	16 May 2003 16:07:22 -0000	1.5
@@ -56,7 +56,8 @@
 static struct mtd_info *mymtds[2];
 static struct mtd_partition *parsed_parts[2];
 static int nr_parsed_parts[2];
-static char *part_type[2];
+
+static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
 
 static int __init init_lubbock(void)
 {
@@ -97,14 +98,11 @@
 		}
 		set_module_owner(mymtds[i]);
 
-#ifdef CONFIG_MTD_REDBOOT_PARTS
-		int ret = parse_redboot_partitions(mymtds[i], &parsed_parts[i], 0);
+		int ret = parse_mtd_partitions(mymtds[i], probes,
+					       &parsed_parts[i], 0);
 
-		if (ret > 0) {
-			part_type[i] = "RedBoot";
+		if (ret > 0)
 			nr_parsed_parts[i] = ret;
-		}
-#endif
 	}
 
 	if (!mymtds[0] && !mymtds[1])
@@ -114,8 +112,6 @@
 		if (!mymtds[i]) {
 			printk(KERN_WARNING "%s is absent. Skipping\n", lubbock_maps[i].name);
 		} else if (nr_parsed_parts[i]) {
-			printk("Using %s partitions on %s\n", part_type[i], 
-			       lubbock_maps[i].name);
 			add_mtd_partitions(mymtds[i], parsed_parts[i], nr_parsed_parts[i]);
 		} else if (!i) {
 			printk("Using static partitions on %s\n", lubbock_maps[i].name);