From 7f7e607f93d8df69358082fbd59386801cbb112c Mon Sep 17 00:00:00 2001
From: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Date: Wed, 4 Jul 2012 11:06:02 +0300
Subject: [PATCH] --- yaml --- r: 329062 b: refs/heads/master c:
 1b2a5790613756d54fdf58d0b3965e43735f153b h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/mtd/ubi/Kconfig | 16 ----------------
 trunk/drivers/mtd/ubi/ubi.h   |  3 ---
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index f35a6833310c..03771d14d6f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37f758a036da56c7cff81b68d1d872752079eb6c
+refs/heads/master: 1b2a5790613756d54fdf58d0b3965e43735f153b
diff --git a/trunk/drivers/mtd/ubi/Kconfig b/trunk/drivers/mtd/ubi/Kconfig
index 76195ac90e51..b2f4f0f032f1 100644
--- a/trunk/drivers/mtd/ubi/Kconfig
+++ b/trunk/drivers/mtd/ubi/Kconfig
@@ -27,22 +27,6 @@ config MTD_UBI_WL_THRESHOLD
 	  life-cycle less than 10000, the threshold should be lessened (e.g.,
 	  to 128 or 256, although it does not have to be power of 2).
 
-config MTD_UBI_BEB_RESERVE
-	int "Percentage of reserved eraseblocks for bad eraseblocks handling"
-	default 2
-	range 0 25
-	help
-	  If the MTD device admits of bad eraseblocks (e.g. NAND flash), UBI
-	  reserves some amount of physical eraseblocks to handle new bad
-	  eraseblocks. When a physical eraseblock becomes bad, UBI uses these
-	  reserved physical eraseblocks to relocate the bad one. This
-	  configuration option specifies how many physical eraseblocks will be
-	  reserved for bad eraseblock handling (percents of total number of
-	  good physical eraseblocks on this MTD partition). If the underlying
-	  flash does not admit of bad eraseblocks (e.g. NOR flash), this value
-	  is ignored and nothing is reserved. Leave the default value if
-	  unsure.
-
 config MTD_UBI_BEB_LIMIT
 	int "Percentage of maximum expected bad eraseblocks"
 	default 2
diff --git a/trunk/drivers/mtd/ubi/ubi.h b/trunk/drivers/mtd/ubi/ubi.h
index aeb459eb7e42..c94612e67c47 100644
--- a/trunk/drivers/mtd/ubi/ubi.h
+++ b/trunk/drivers/mtd/ubi/ubi.h
@@ -59,9 +59,6 @@
 #define ubi_err(fmt, ...) printk(KERN_ERR "UBI error: %s: " fmt "\n", \
 				 __func__, ##__VA_ARGS__)
 
-/* Lowest number PEBs reserved for bad PEB handling */
-#define MIN_RESEVED_PEBS 2
-
 /* Background thread name pattern */
 #define UBI_BGT_NAME_PATTERN "ubi_bgt%dd"