mtd/drivers/mtd/maps lubbock-flash.c,1.9,1.10

Russell King rmk at infradead.org
Fri Feb 27 15:59:23 EST 2004


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

Modified Files:
	lubbock-flash.c 
Log Message:
Fix build problems:
lubbock-flash.c:77: error: too few arguments to function `__ioremap'
lubbock-flash.c:101: warning: ISO C90 forbids mixed declarations and code


Index: lubbock-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/lubbock-flash.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lubbock-flash.c	23 Jun 2003 11:48:18 -0000	1.9
+++ lubbock-flash.c	27 Feb 2004 20:59:20 -0000	1.10
@@ -74,7 +74,7 @@
 	lubbock_maps[flashboot].name = "Lubbock Boot ROM";
 
 	for (i = 0; i < 2; i++) {
-		lubbock_maps[i].virt = (unsigned long)__ioremap(lubbock_maps[i].phys, WINDOW_SIZE, 0);
+		lubbock_maps[i].virt = (unsigned long)ioremap(lubbock_maps[i].phys, WINDOW_SIZE);
 		if (!lubbock_maps[i].virt) {
 			printk(KERN_WARNING "Failed to ioremap %s\n", lubbock_maps[i].name);
 			if (!ret)
@@ -97,8 +97,8 @@
 		}
 		mymtds[i]->owner = THIS_MODULE;
 
-		int ret = parse_mtd_partitions(mymtds[i], probes,
-					       &parsed_parts[i], 0);
+		ret = parse_mtd_partitions(mymtds[i], probes,
+					   &parsed_parts[i], 0);
 
 		if (ret > 0)
 			nr_parsed_parts[i] = ret;




More information about the linux-mtd-cvs mailing list