mtd/drivers/mtd/nand autcpu12.c,1.18,1.19

[David Woodhouse]

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

Modified Files:
	autcpu12.c 
Log Message:
Merge from 2.6: include version.h. 
Whitespace cleanup on struct definitions.


Index: autcpu12.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/autcpu12.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- autcpu12.c	28 May 2004 23:20:13 -0000	1.18
+++ autcpu12.c	12 Jul 2004 15:02:15 -0000	1.19
@@ -15,7 +15,7 @@
  *  Overview:
  *   This is a device driver for the NAND flash device found on the
  *   autronix autcpu12 board, which is a SmartMediaCard. It supports 
- *   16MB, 32MB and 64MB cards.
+ *   16MiB, 32MiB and 64MiB cards.
  *
  *
  *	02-12-2002 TG	Cleanup of module params
@@ -27,6 +27,7 @@
  *	10-06-2002 TG	128K card support added
  */
 
+#include <linux/version.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -71,39 +72,39 @@
  * Define partitions for flash devices
  */
 static struct mtd_partition partition_info16k[] = {
-	{ .name = "AUTCPU12 flash partition 1",
-	  .offset =  0,
-	  .size =    8 * SZ_1M },
-	{ .name = "AUTCPU12 flash partition 2",
-	  .offset =  8 * SZ_1M,
-	  .size =    8 * SZ_1M },
+	{ .name		= "AUTCPU12 flash partition 1",
+	  .offset	= 0,
+	  .size		= 8 * SZ_1M },
+	{ .name		= "AUTCPU12 flash partition 2",
+	  .offset	= 8 * SZ_1M,
+	  .size		= 8 * SZ_1M },
 };
 
 static struct mtd_partition partition_info32k[] = {
-	{ .name = "AUTCPU12 flash partition 1",
-	  .offset =  0,
-	  .size =    8 * SZ_1M },
-	{ .name = "AUTCPU12 flash partition 2",
-	  .offset =  8 * SZ_1M,
-	  .size =   24 * SZ_1M },
+	{ .name		= "AUTCPU12 flash partition 1",
+	  .offset	= 0,
+	  .size		= 8 * SZ_1M },
+	{ .name		= "AUTCPU12 flash partition 2",
+	  .offset	= 8 * SZ_1M,
+	  .size		= 24 * SZ_1M },
 };
 
 static struct mtd_partition partition_info64k[] = {
-	{ .name = "AUTCPU12 flash partition 1",
-	  .offset =  0,
-	  .size =   16 * SZ_1M },
-	{ .name = "AUTCPU12 flash partition 2",
-	  .offset = 16 * SZ_1M,
-	  .size =   48 * SZ_1M },
+	{ .name		= "AUTCPU12 flash partition 1",
+	  .offset	= 0,
+	  .size		= 16 * SZ_1M },
+	{ .name		= "AUTCPU12 flash partition 2",
+	  .offset	= 16 * SZ_1M,
+	  .size		= 48 * SZ_1M },
 };
 
 static struct mtd_partition partition_info128k[] = {
-	{ .name = "AUTCPU12 flash partition 1",
-	  .offset =  0,
-	  .size =   16 * SZ_1M },
-	{ .name = "AUTCPU12 flash partition 2",
-	  .offset = 16 * SZ_1M,
-	  .size =   112 * SZ_1M },
+	{ .name		= "AUTCPU12 flash partition 1",
+	  .offset	= 0,
+	  .size		= 16 * SZ_1M },
+	{ .name		= "AUTCPU12 flash partition 2",
+	  .offset	= 16 * SZ_1M,
+	  .size		= 112 * SZ_1M },
 };
 
 #define NUM_PARTITIONS16K 2