Merge git://git.denx.de/u-boot-x86

[people/ms/u-boot.git] / include / ubi_uboot.h

diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h
index 324fe720163ac06b84f3fac8803ec863fa5c3200..80acbcb148683d1a6e1ae44b59bd44e66cd93ef6 100644 (file)
--- a/include/ubi_uboot.h
+++ b/include/ubi_uboot.h
@@ -32,12 +32,9 @@
 #include <onenand_uboot.h>
 #endif
 
-#include <asm/errno.h>
+#include <linux/errno.h>
 
 /* configurable */
-#if !defined(CONFIG_MTD_UBI_WL_THRESHOLD)
-#define CONFIG_MTD_UBI_WL_THRESHOLD    4096
-#endif
 #define CONFIG_MTD_UBI_BEB_RESERVE     1
 
 /* debug options (Linux: drivers/mtd/ubi/Kconfig.debug) */
@@ -59,10 +56,6 @@
  */
 #define CONFIG_MTD_UBI_MODULE
 
-#if !defined(CONFIG_MTD_UBI_BEB_LIMIT)
-#define CONFIG_MTD_UBI_BEB_LIMIT       20
-#endif
-
 /* build.c */
 #define get_device(...)
 #define put_device(...)