From e65187bc75c46107cf96031a9ccbde5877a839cc Mon Sep 17 00:00:00 2001
From: Brian Norris <computersforpeace@gmail.com>
Date: Mon, 24 Sep 2012 20:40:53 -0700
Subject: [PATCH] --- yaml --- r: 332781 b: refs/heads/master c:
 b9e48534d8f4eb17d531f54d2cb3b9138db13ccb h: refs/heads/master i:   332779:
 c5763e856563e8ded179a389b514169a08ba6ab1 v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/mtd/nand.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 958b3030c469..4e27efbbbef6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3b88bd604283ef83ae6e8f53622d5b1ffe9d43a
+refs/heads/master: b9e48534d8f4eb17d531f54d2cb3b9138db13ccb
diff --git a/trunk/include/linux/mtd/nand.h b/trunk/include/linux/mtd/nand.h
index 2beeb6e4e4e6..24e915957e4f 100644
--- a/trunk/include/linux/mtd/nand.h
+++ b/trunk/include/linux/mtd/nand.h
@@ -56,7 +56,7 @@ extern int nand_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len);
  * is supported now. If you add a chip with bigger oobsize/page
  * adjust this accordingly.
  */
-#define NAND_MAX_OOBSIZE	576
+#define NAND_MAX_OOBSIZE	640
 #define NAND_MAX_PAGESIZE	8192
 
 /*