From: vimal singh <vimalsingh@ti.com>
Date: Tue, 7 Oct 2008 06:11:08 +0000 (+0530)
Subject: OMAP3 NAND: move NAND_BLOCK_SIZE macro to board-3430sdp-flash.c
X-Git-Tag: v2.6.27-omap1~12
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=ea6006838e5fca5f8157c015b2fc9c734c39c19e

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 b16f70c9e85..6b0419cc353 100644
--- 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 aac285162dd..81774e5facf 100644
--- 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
  *