Merge by hand (conflicts in sd.c)

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

diff --git a/fs/Makefile b/fs/Makefile
index 20edcf28bfd217d7d7d3c434293de6f5d40c91e0..cf95eb894fd53776b3429354834aac373f0e8170 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -12,6 +12,7 @@ obj-y :=      open.o read_write.o file_table.o buffer.o  bio.o super.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