diff --git a/[refs] b/[refs]
index 03771d14d6f8..468d095dee4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b2a5790613756d54fdf58d0b3965e43735f153b
+refs/heads/master: 3419cc303f643e3445be954e5590cc0e71c5c461
diff --git a/trunk/arch/arm/configs/sam9_l9260_defconfig b/trunk/arch/arm/configs/sam9_l9260_defconfig
index f6917c950f44..da276f98ceb8 100644
--- a/trunk/arch/arm/configs/sam9_l9260_defconfig
+++ b/trunk/arch/arm/configs/sam9_l9260_defconfig
@@ -39,7 +39,6 @@ CONFIG_MTD_NAND=y
 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