summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 14:22:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-11 14:22:55 -0700
commit3bb66d7f8cc31537a3170c9bb82b38e538b984c5 (patch)
treee7174a8e9b805e056c3b0e510789a611ce4eeb1c /init
parent512626a04e72aca60effe111fa0333ed0b195d21 (diff)
parenta092ee20fd33d2df0990dcbf2235afc181612818 (diff)
downloadlinux-3bb66d7f8cc31537a3170c9bb82b38e538b984c5.tar.gz
linux-3bb66d7f8cc31537a3170c9bb82b38e538b984c5.tar.bz2
linux-3bb66d7f8cc31537a3170c9bb82b38e538b984c5.zip
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
* 'for-linus' of git://git.infradead.org/users/eparis/notify: fsnotify: allow groups to set freeing_mark to null inotify/dnotify: should_send_event shouldn't match on FS_EVENT_ON_CHILD dnotify: do not bother to lock entry->lock when reading mask dnotify: do not use ?true:false when assigning to a bool fsnotify: move events should indicate the event was on a child inotify: reimplement inotify using fsnotify fsnotify: handle filesystem unmounts with fsnotify marks fsnotify: fsnotify marks on inodes pin them in core fsnotify: allow groups to add private data to events fsnotify: add correlations between events fsnotify: include pathnames with entries when possible fsnotify: generic notification queue and waitq dnotify: reimplement dnotify using fsnotify fsnotify: parent event notification fsnotify: add marks to inodes so groups can interpret how to handle those inodes fsnotify: unified filesystem notification backend
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 9b68fee8d79e..c649657e2259 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -302,7 +302,8 @@ config AUDITSYSCALL
config AUDIT_TREE
def_bool y
- depends on AUDITSYSCALL && INOTIFY
+ depends on AUDITSYSCALL
+ select INOTIFY
menu "RCU Subsystem"