diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-13 02:11:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-13 02:11:29 -0400 |
| commit | ad56b0797e67df5e04b2f1a1e02900145c5c16f2 (patch) | |
| tree | 1569bed80a4de531afb88cac9d60ef8bd0aa89f2 /fs/notify/inotify/Kconfig | |
| parent | 668eb65f092902eb7dd526af73d4a7f025a94612 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge commit 'v2.6.34-rc7' into tracing/core
Merge reason: Update from -rc5 to -rc7.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/notify/inotify/Kconfig')
| -rw-r--r-- | fs/notify/inotify/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/notify/inotify/Kconfig b/fs/notify/inotify/Kconfig index 3e56dbffe729..b3a159b21cfd 100644 --- a/fs/notify/inotify/Kconfig +++ b/fs/notify/inotify/Kconfig | |||
| @@ -15,6 +15,7 @@ config INOTIFY | |||
| 15 | 15 | ||
| 16 | config INOTIFY_USER | 16 | config INOTIFY_USER |
| 17 | bool "Inotify support for userspace" | 17 | bool "Inotify support for userspace" |
| 18 | select ANON_INODES | ||
| 18 | select FSNOTIFY | 19 | select FSNOTIFY |
| 19 | default y | 20 | default y |
| 20 | ---help--- | 21 | ---help--- |