mtd/drivers/mtd/maps Kconfig,1.49,1.50 sa1100-flash.c,1.47,1.48

[gleixner at infradead.org]

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

Modified Files:
	Kconfig sa1100-flash.c 
Log Message:
Mainstream merge. Update to current

Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/Kconfig,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Kconfig	17 Mar 2005 19:59:47 -0000	1.49
+++ Kconfig	18 Mar 2005 02:01:48 -0000	1.50
@@ -422,7 +422,7 @@
 	tristate "Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board"
 	depends on MIPS && MTD_CFI && MTD_JEDECPROBE && MTD_PARTITIONS
 	help
-	  This provides a mapping driver for the Integrated Tecnology
+	  This provides a mapping driver for the Integrated Technology
 	  Express, Inc (ITE) QED-4N-S01B eval board and the Globespan IVR
 	  Reference Board. It provides the necessary addressing, length,
 	  buswidth, vpp code and addition setup of the flash device for

Index: sa1100-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sa1100-flash.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sa1100-flash.c	1 Nov 2004 13:44:36 -0000	1.47
+++ sa1100-flash.c	18 Mar 2005 02:01:48 -0000	1.48
@@ -5,7 +5,6 @@
  * 
  * $Id$
  */
-
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
@@ -14,177 +13,24 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
[...1541 lines suppressed...]
+};
+
+static int __init sa1100_mtd_init(void)
+{
+	return driver_register(&sa1100_mtd_driver);
+}
+
+static void __exit sa1100_mtd_exit(void)
 {
-	sa1100_destroy_mtd(info, mymtd);
-	sa1100_destroy_partitions();
+	driver_unregister(&sa1100_mtd_driver);
 }
 
 module_init(sa1100_mtd_init);
-module_exit(sa1100_mtd_cleanup);
+module_exit(sa1100_mtd_exit);
 
 MODULE_AUTHOR("Nicolas Pitre");
 MODULE_DESCRIPTION("SA1100 CFI map driver");