diff --git a/[refs] b/[refs]
index f3d764f80f76..7a42a3c78e13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 183ae6cf8b903129eea05c596b057372818c2074
+refs/heads/master: afe7d12b6d997ff8ceff02e405eae9ba54aa8350
diff --git a/trunk/arch/arm/configs/sam9_l9260_defconfig b/trunk/arch/arm/configs/sam9_l9260_defconfig
index ecf2531523a1..f6917c950f44 100644
--- a/trunk/arch/arm/configs/sam9_l9260_defconfig
+++ b/trunk/arch/arm/configs/sam9_l9260_defconfig
@@ -40,6 +40,7 @@ CONFIG_MTD_NAND_ATMEL=y
 CONFIG_MTD_NAND_PLATFORM=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_BEB_RESERVE=3
+CONFIG_MTD_UBI_BEB_LIMIT=3
 CONFIG_MTD_UBI_GLUEBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y