OMAP3 NAND: move NAND_BLOCK_SIZE macro to board-3430sdp-flash.c

Sync nand.h with mainline kernel

Moving NAND_BLOCK_SIZE definition to board-3430sdp-flash.c

Signed-off-by: Vimal Singh <vimalsingh@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/board-3430sdp-flash.c b/arch/arm/mach-omap2/board-3430sdp-flash.c
index b16f70c9e852561363125dd9f48b7b5c80515e87..6b0419cc35354da6a25d1f14fb65e36107db1d16 100644 (file)
--- a/arch/arm/mach-omap2/board-3430sdp-flash.c
+++ b/arch/arm/mach-omap2/board-3430sdp-flash.c
@@ -26,6 +26,8 @@
 #include <mach/gpmc.h>
 #include <mach/nand.h>
 
+#define NAND_BLOCK_SIZE                SZ_128K
+
 static struct mtd_partition sdp_nor_partitions[] = {
        /* bootloader (U-Boot, etc) in first sector */
        {

diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index aac285162dd1b36a2855c6697beacbe754f99243..81774e5facf4e74a2d5dd742bae6bb81a1922b17 100644 (file)
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -45,7 +45,7 @@ extern void nand_wait_ready(struct mtd_info *mtd);
  */
 #define NAND_MAX_OOBSIZE       64
 #define NAND_MAX_PAGESIZE      2048
-#define NAND_BLOCK_SIZE                SZ_128K
+
 /*
  * Constants for hardware specific CLE/ALE/NCE function
  *