Merge by hand (conflicts in sd.c)

[sfrench/cifs-2.6.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index fc92e59e9faffe9a81ecb404e9f16f0aaaf2a55c..cf95eb894fd53776b3429354834aac373f0e8170 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -10,7 +10,9 @@ obj-y :=      open.o read_write.o file_table.o buffer.o  bio.o super.o \
                ioctl.o readdir.o select.o fifo.o locks.o dcache.o inode.o \
                attr.o bad_inode.o file.o filesystems.o namespace.o aio.o \
                seq_file.o xattr.o libfs.o fs-writeback.o mpage.o direct-io.o \
+               ioprio.o
 
+obj-$(CONFIG_INOTIFY)          += inotify.o
 obj-$(CONFIG_EPOLL)            += eventpoll.o
 obj-$(CONFIG_COMPAT)           += compat.o