mtd/include/linux/mtd nand.h,1.62,1.63

[gleixner at infradead.org]

Update of /home/cvs/mtd/include/linux/mtd
In directory phoenix.infradead.org:/tmp/cvs-serv1422

Modified Files:
	nand.h 
Log Message:
keep NO_AUTOINCR if set by board driver before calling nand_scan so the correct setting is there for nand_scan_bbt

Index: nand.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/mtd/nand.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- nand.h	24 Jun 2004 14:59:28 -0000	1.62
+++ nand.h	7 Jul 2004 16:29:43 -0000	1.63
@@ -180,7 +180,7 @@
 #define NAND_HAS_COPYBACK(chip) ((chip->options & NAND_COPYBACK))
 
 /* Mask to zero out the chip options, which come from the id table */
-#define NAND_CHIPOPTIONS_MSK	0x0000ffff
+#define NAND_CHIPOPTIONS_MSK	(0x0000ffff & ~NAND_NO_AUTOINCR)
 
 /* Non chip related options */
 /* Use a flash based bad block table. This option is passed to the