Merge git://git.infradead.org/mtd-2.6

[cascardo/linux.git] / arch / arm / plat-s3c / include / plat / nand.h

diff --git a/arch/arm/plat-s3c/include/plat/nand.h b/arch/arm/plat-s3c/include/plat/nand.h
index 0659859..226147b 100644 (file)
--- a/arch/arm/plat-s3c/include/plat/nand.h
+++ b/arch/arm/plat-s3c/include/plat/nand.h
@@ -17,6 +17,7 @@
  *                     Setting this flag will allow the kernel to
  *                     look for it at boot time and also skip the NAND
  *                     scan.
+ * @options:           Default value to set into 'struct nand_chip' options.
  * @nr_chips:          Number of chips in this set
  * @nr_partitions:     Number of partitions pointed to by @partitions
  * @name:              Name of set (optional)
@@ -31,6 +32,7 @@ struct s3c2410_nand_set {
        unsigned int            disable_ecc:1;
        unsigned int            flash_bbt:1;
 
+       unsigned int            options;
        int                     nr_chips;
        int                     nr_partitions;
        char                    *name;