summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-01-07 15:24:54 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2010-01-07 15:24:54 +1100
commit578163a8373e2b79b80c74e29d9e074900639f38 (patch)
tree709d342bfc2a22ab44eef1f8e99e6e97f7c8be57 /init
parent3d747749dca49f016f550dd7f850f647d34121fd (diff)
parent9ec95a50f4d31fe58fd8fae9f86627eea4582ccb (diff)
Merge remote branch 'fsnotify/for-next'
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig10
1 files changed, 7 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig
index c0ccf9049e35..ee33cc63ced5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -310,13 +310,17 @@ config AUDITSYSCALL
help
Enable low-overhead system-call auditing infrastructure that
can be used independently or with another kernel subsystem,
- such as SELinux. To use audit's filesystem watch feature, please
- ensure that INOTIFY is configured.
+ such as SELinux.
+
+config AUDIT_WATCH
+ def_bool y
+ depends on AUDITSYSCALL
+ select FSNOTIFY
config AUDIT_TREE
def_bool y
depends on AUDITSYSCALL
- select INOTIFY
+ select FSNOTIFY
menu "RCU Subsystem"