- sync vserver branch: will help future merges

[linux-2.6.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index 82730d5..18025c4 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_BINFMT_MISC)     += binfmt_misc.o
 obj-y                          += binfmt_script.o
 
 obj-$(CONFIG_BINFMT_ELF)       += binfmt_elf.o
+obj-$(CONFIG_BINFMT_ELF_FDPIC) += binfmt_elf_fdpic.o
 obj-$(CONFIG_BINFMT_SOM)       += binfmt_som.o
 obj-$(CONFIG_BINFMT_FLAT)      += binfmt_flat.o
 
@@ -57,7 +58,6 @@ obj-$(CONFIG_RELAYFS_FS)      += relayfs/
 obj-$(CONFIG_CODA_FS)          += coda/
 obj-$(CONFIG_MINIX_FS)         += minix/
 obj-$(CONFIG_FAT_FS)           += fat/
-obj-$(CONFIG_UMSDOS_FS)                += umsdos/
 obj-$(CONFIG_MSDOS_FS)         += msdos/
 obj-$(CONFIG_VFAT_FS)          += vfat/
 obj-$(CONFIG_BFS_FS)           += bfs/
@@ -93,7 +93,6 @@ obj-$(CONFIG_JFS_FS)          += jfs/
 obj-$(CONFIG_XFS_FS)           += xfs/
 obj-$(CONFIG_AFS_FS)           += afs/
 obj-$(CONFIG_BEFS_FS)          += befs/
-obj-$(CONFIG_EXTERNFS)         += hostfs/
-obj-$(CONFIG_RCFS_FS)          += rcfs/
 obj-$(CONFIG_HOSTFS)           += hostfs/
 obj-$(CONFIG_HPPFS)            += hppfs/
+obj-$(CONFIG_DEBUG_FS)         += debugfs/