summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-10-28 23:21:56 +0200
committerEric Paris <eparis@redhat.com>2010-10-28 23:22:13 +0200
commit9343919c1495b085a4a1cf4cbada8d7888daf099 (patch)
treedf865fc17ad2db52caad4392f04bc6cc779d2036
parentMerge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff)
downloadlinux-9343919c1495b085a4a1cf4cbada8d7888daf099.tar.xz
linux-9343919c1495b085a4a1cf4cbada8d7888daf099.zip
fanotify: allow fanotify to be built
We disabled the ability to build fanotify in commit 7c5347733dcc4ba0ba. This reverts that commit and allows people to build fanotify. Signed-off-by: Eric Paris <eparis@redhat.com>
-rw-r--r--fs/notify/Kconfig2
-rw-r--r--include/linux/Kbuild1
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/notify/Kconfig b/fs/notify/Kconfig
index b388443c3a09..22c629eedd82 100644
--- a/fs/notify/Kconfig
+++ b/fs/notify/Kconfig
@@ -3,4 +3,4 @@ config FSNOTIFY
source "fs/notify/dnotify/Kconfig"
source "fs/notify/inotify/Kconfig"
-#source "fs/notify/fanotify/Kconfig"
+source "fs/notify/fanotify/Kconfig"
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 90e3ed3a3144..97319a8fc1e0 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -118,6 +118,7 @@ header-y += eventpoll.h
header-y += ext2_fs.h
header-y += fadvise.h
header-y += falloc.h
+header-y += fanotify.h
header-y += fb.h
header-y += fcntl.h
header-y += fd.h