diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-21 02:46:21 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-21 02:46:21 +0200 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /fs/Makefile | |
| parent | Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ (diff) | |
| parent | Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/... (diff) | |
| download | linux-70ac4385a13f78bc478f26d317511893741b05bd.tar.xz linux-70ac4385a13f78bc478f26d317511893741b05bd.zip | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index 078d3d1191a5..d0ea6bfccf29 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -13,6 +13,7 @@ obj-y := open.o read_write.o file_table.o buffer.o bio.o super.o \ ioprio.o pnode.o drop_caches.o splice.o sync.o obj-$(CONFIG_INOTIFY) += inotify.o +obj-$(CONFIG_INOTIFY_USER) += inotify_user.o obj-$(CONFIG_EPOLL) += eventpoll.o obj-$(CONFIG_COMPAT) += compat.o compat_ioctl.o |