diff --git a/[refs] b/[refs]
index 194bd973cb2f..dd38f4cbb431 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06f2ae3c91ea04b0d640e0dd9cf69a265f5ecda6
+refs/heads/master: f53fdebcc3e1e5d15ffd0b1204d5944b4ceb8a07
diff --git a/trunk/drivers/mtd/Kconfig b/trunk/drivers/mtd/Kconfig
index c800247c04fb..23088b3372d0 100644
--- a/trunk/drivers/mtd/Kconfig
+++ b/trunk/drivers/mtd/Kconfig
@@ -33,15 +33,6 @@ config MTD_TESTS
 	  should normally be compiled as kernel modules. The modules perform
 	  various checks and verifications when loaded.
 
-config MTD_CONCAT
-	bool
-	default y
-	help
-	  Support for concatenating several MTD devices into a single
-	  (virtual) one. This allows you to have -for example- a JFFS(2)
-	  file system spanning multiple physical flash chips. If unsure,
-	  say 'Y'.
-
 config MTD_PARTITIONS
 	bool "MTD partitioning support"
 	help