X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=fs%2FKconfig;h=5e8e9d9ccb331ffe1a88c32f402a70eefca4ad18;hb=5ef213f6842277ee1df5659f59fac0ffc9beb411;hp=276ff3baaafec7722d92a2e1ba125eb034e7e230;hpb=e05135d1550e73f722ae92909f9c9f44b305e9e2;p=powerpc.git

diff --git a/fs/Kconfig b/fs/Kconfig
index 276ff3baaa..5e8e9d9ccb 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -426,7 +426,6 @@ config OCFS2_FS
 	select CONFIGFS_FS
 	select JBD
 	select CRC32
-	select INET
 	help
 	  OCFS2 is a general purpose extent based shared disk cluster file
 	  system with many similarities to ext3. It supports 64 bit inode
@@ -1198,13 +1197,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