mtd/drivers/mtd/maps sa1100-flash.c,1.35,1.36

[David Woodhouse]

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

Modified Files:
	sa1100-flash.c 
Log Message:
Update from 2.5.67-rmk1

Index: sa1100-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sa1100-flash.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sa1100-flash.c	21 May 2003 12:45:19 -0000	1.35
+++ sa1100-flash.c	29 May 2003 08:59:35 -0000	1.36
@@ -12,187 +12,185 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
+#include <linux/mtd/concat.h>
 
[...1903 lines suppressed...]
 	return ret;
 }
 
 static void __exit sa1100_mtd_cleanup(void)
 {
-	if (mymtd) {
-		del_mtd_partitions(mymtd);
-		map_destroy(mymtd);
-		if (parsed_parts)
-			kfree(parsed_parts);
-	}
-	if (sa1100_map.virt != WINDOW_ADDR) {
-		iounmap((void *)sa1100_map.virt);
-		release_mem_region(sa1100_map.phys, sa1100_map.size);
-	}
+	sa1100_destroy_mtd(info, mymtd);
+	sa1100_destroy_partitions();
 }
 
 module_init(sa1100_mtd_init);