From a6508ab2abb1b771b102de1c601410707696809a Mon Sep 17 00:00:00 2001
From: Brian Norris <computersforpeace@gmail.com>
Date: Tue, 30 Aug 2011 18:45:46 -0700
Subject: [PATCH] --- yaml --- r: 274943 b: refs/heads/master c:
 19fb4341ad7a72e4c996234a1834e52e1f7954ba h: refs/heads/master i:   274941:
 ef8e48a0fd901b80f0dbde2485e9ba6c474ecc78   274939:
 caa5477344a89d6e61ce3cf1d597ed8fbdb77fb0   274935:
 7ba1261ec057105216c69a9720e9d450b636cc11   274927:
 425c30cf66e454e4cc0b6610feff576d2184ede7   274911:
 4084cb3d5844c5ec01b432bfb462df52c2d4bbe9   274879:
 3cf0aa4519dcb682b7c6501dcf373ca6597cde17   274815:
 151db1354bbc86308ea678831cddc39e02d2a7c2   274687:
 aec2d0b6453992c4037611a1e917203f138761bd   274431:
 6e03995f1e32b28db55d7cd7e46ca3a8189cae77 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/mtd/mtdchar.c | 4 ++--
 trunk/include/mtd/mtd-abi.h | 5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b874586ec3c4..e75f0f0215ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a89ff885ff9f64ea62669100766e10e4e257c6e
+refs/heads/master: 19fb4341ad7a72e4c996234a1834e52e1f7954ba
diff --git a/trunk/drivers/mtd/mtdchar.c b/trunk/drivers/mtd/mtdchar.c
index 1547e2a68279..8feb5fdcd97b 100644
--- a/trunk/drivers/mtd/mtdchar.c
+++ b/trunk/drivers/mtd/mtdchar.c
@@ -672,8 +672,8 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)
 		info.erasesize	= mtd->erasesize;
 		info.writesize	= mtd->writesize;
 		info.oobsize	= mtd->oobsize;
-		/* The below fields are obsolete */
-		info.ecctype	= -1;
+		/* The below field is obsolete */
+		info.padding	= 0;
 		if (copy_to_user(argp, &info, sizeof(struct mtd_info_user)))
 			return -EFAULT;
 		break;
diff --git a/trunk/include/mtd/mtd-abi.h b/trunk/include/mtd/mtd-abi.h
index 7dee9709fbfc..1a7e1d20adf9 100644
--- a/trunk/include/mtd/mtd-abi.h
+++ b/trunk/include/mtd/mtd-abi.h
@@ -129,10 +129,7 @@ struct mtd_info_user {
 	__u32 erasesize;
 	__u32 writesize;
 	__u32 oobsize;	/* Amount of OOB data per block (e.g. 16) */
-	/* The below two fields are obsolete and broken, do not use them
-	 * (TODO: remove at some point) */
-	__u32 ecctype;
-	__u32 eccsize;
+	__u64 padding;	/* Old obsolete field; do not use */
 };
 
 struct region_info_user {