Merge branch 'master'

1 files changed, 3 insertions, 0 deletions

diff --git a/include/asm-arm/mach/flash.h b/include/asm-arm/mach/flash.h
index cd57436d9874..05b029ef6371 100644
--- a/include/asm-arm/mach/flash.h
+++ b/include/asm-arm/mach/flash.h
@@ -11,6 +11,7 @@
 #define ASMARM_MACH_FLASH_H
 
 struct mtd_partition;
+struct mtd_info;
 
 /*
  * map_name:    the map probe function name
@@ -19,6 +20,7 @@ struct mtd_partition;
  * init:        method called at driver/device initialisation
  * exit:        method called at driver/device removal
  * set_vpp:     method called to enable or disable VPP
+ * mmcontrol:   method called to enable or disable Sync. Burst Read in OneNAND
  * parts:       optional array of mtd_partitions for static partitioning
  * nr_parts:    number of mtd_partitions for static partitoning
  */
@@ -29,6 +31,7 @@ struct flash_platform_data {
         int             (*init)(void);
         void            (*exit)(void);
         void            (*set_vpp)(int on);
+        void            (*mmcontrol)(struct mtd_info *mtd, int sync_read);
         struct mtd_partition *parts;
         unsigned int    nr_parts;
 };