Merge branch 'pci/deletion' into next

[~andy/linux] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index 5e67e57b59dcb730d18a75b7edcdaa3f4632f1a7..4fe6df3ec28fe5392b680e853b0fbfef6313179a 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -7,7 +7,7 @@
 
 obj-y :=       open.o read_write.o file_table.o super.o \
                char_dev.o stat.o exec.o pipe.o namei.o fcntl.o \
-               ioctl.o readdir.o select.o fifo.o dcache.o inode.o \
+               ioctl.o readdir.o select.o dcache.o inode.o \
                attr.o bad_inode.o file.o filesystems.o namespace.o \
                seq_file.o xattr.o libfs.o fs-writeback.o \
                pnode.o splice.o sync.o utimes.o \
@@ -125,3 +125,4 @@ obj-$(CONFIG_F2FS_FS)               += f2fs/
 obj-y                          += exofs/ # Multiple modules
 obj-$(CONFIG_CEPH_FS)          += ceph/
 obj-$(CONFIG_PSTORE)           += pstore/
+obj-$(CONFIG_EFIVAR_FS)                += efivarfs/