diff --git a/[refs] b/[refs]
index 17de77552a2c..7ef6ca422ab9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bfa4df2b65a94ce761306ab53447010b928b7dd
+refs/heads/master: dad94318907b5947b499f88f38c074227245d15c
diff --git a/trunk/drivers/mtd/nand/Kconfig b/trunk/drivers/mtd/nand/Kconfig
index b712aedd89fb..8f402d46a362 100644
--- a/trunk/drivers/mtd/nand/Kconfig
+++ b/trunk/drivers/mtd/nand/Kconfig
@@ -373,8 +373,6 @@ config MTD_NAND_ATMEL_ECC_NONE
 
 	  If unsure, say N
 
-	  endchoice
-
 endchoice
 
 config MTD_NAND_PXA3xx