


---

 25-akpm/fs/Kconfig  |   16 ----------------
 25-akpm/fs/Makefile |    1 -
 2 files changed, 17 deletions(-)

diff -puN fs/Kconfig~remove-intermezzo fs/Kconfig
--- 25/fs/Kconfig~remove-intermezzo	2004-05-09 02:36:55.010825872 -0700
+++ 25-akpm/fs/Kconfig	2004-05-09 02:37:15.246749544 -0700
@@ -1643,22 +1643,6 @@ config CODA_FS_OLD_API
 	  
 	  For most cases you probably want to say N.
 
-#
-# Intermezzo broke when we added the expanded NGROUPS patches
-#
-config INTERMEZZO_FS
-	tristate "InterMezzo file system support (replicating fs) (EXPERIMENTAL)"
-	depends on INET && EXPERIMENTAL 
-	help
-	  InterMezzo is a networked file system with disconnected operation
-	  and kernel level write back caching.  It is most often used for
-	  replicating potentially large trees or keeping laptop/desktop copies
-	  in sync.
-
-	  If you say Y or M your kernel or module will provide InterMezzo
-	  support.  You will also need a file server daemon, which you can get
-	  from <http://www.inter-mezzo.org/>.
-
 config AFS_FS
 # for fs/nls/Config.in
 	tristate "Andrew File System support (AFS) (Experimental)"
diff -puN fs/Makefile~remove-intermezzo fs/Makefile
--- 25/fs/Makefile~remove-intermezzo	2004-05-09 02:36:55.026823440 -0700
+++ 25-akpm/fs/Makefile	2004-05-09 02:37:18.727220432 -0700
@@ -53,7 +53,6 @@ obj-$(CONFIG_CRAMFS)		+= cramfs/
 obj-$(CONFIG_RAMFS)		+= ramfs/
 obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
 obj-$(CONFIG_CODA_FS)		+= coda/
-obj-$(CONFIG_INTERMEZZO_FS)	+= intermezzo/
 obj-$(CONFIG_MINIX_FS)		+= minix/
 obj-$(CONFIG_FAT_FS)		+= fat/
 obj-$(CONFIG_UMSDOS_FS)		+= umsdos/

_
