2 files changed, 6 insertions, 0 deletions

diff --git a/arch/arm/mach-davinci/include/mach/nand.h b/arch/arm/mach-davinci/include/mach/nand.h
index b520c4b5678a..b2ad8090bd10 100644
--- a/arch/arm/mach-davinci/include/mach/nand.h
+++ b/arch/arm/mach-davinci/include/mach/nand.h
@@ -79,6 +79,10 @@ struct davinci_nand_pdata {		/* platform_data */
 
         /* e.g. NAND_BUSWIDTH_16 or NAND_USE_FLASH_BBT */
         unsigned                options;
+
+        /* Main and mirror bbt descriptor overrides */
+        struct nand_bbt_descr   *bbt_td;
+        struct nand_bbt_descr   *bbt_md;
 };
 
 #endif  /* __ARCH_ARM_DAVINCI_NAND_H */
diff --git a/arch/arm/plat-s3c/include/plat/nand.h b/arch/arm/plat-s3c/include/plat/nand.h
index 18f958801e64..afd1673ad0ec 100644
--- 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;