diff --git a/[refs] b/[refs]
index 8eee71eafe34..b86c07d01ee0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9127d4b1d9b2e8fba8e7fbc7f88ea93e5eb01396
+refs/heads/master: 163ca88b9c5858909ee3f8801ae0096b5f94e835
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index 276ff3baaafe..8cd2417a14db 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/fs/Kconfig
@@ -1198,13 +1198,16 @@ config EFS_FS
 
 config JFFS_FS
 	tristate "Journalling Flash File System (JFFS) support"
-	depends on MTD && BLOCK
+	depends on MTD && BLOCK && BROKEN
 	help
 	  JFFS is the Journalling Flash File System developed by Axis
 	  Communications in Sweden, aimed at providing a crash/powerdown-safe
 	  file system for disk-less embedded devices. Further information is
 	  available at (<http://developer.axis.com/software/jffs/>).
 
+	  NOTE: This filesystem is deprecated and is scheduled for removal in
+	  2.6.21.  See Documentation/feature-removal-schedule.txt
+
 config JFFS_FS_VERBOSE
 	int "JFFS debugging verbosity (0 = quiet, 3 = noisy)"
 	depends on JFFS_FS