diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 16:50:27 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 16:50:27 +1100 |
| commit | fe13c9bbd1e997396117300c1310ee9f55808c3b (patch) | |
| tree | 241d1dd4e4c0690a12c1d6926635d19369d31d85 /include/linux/Kbuild | |
| parent | e3fb63b2d663e3c73577dcb189bf51a3faf496d5 (diff) | |
| parent | 162308729bc6d196ae1d1b8225e407175785e931 (diff) | |
Merge remote branch 'fsnotify/for-next'
Conflicts:
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/syscall_table_32.S
fs/afs/write.c
fs/cifs/dir.c
fs/ubifs/file.c
include/asm-generic/fcntl.h
net/socket.c
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 883a7bc446c2..0353b222c09a 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -206,6 +206,7 @@ unifdef-y += ethtool.h unifdef-y += eventpoll.h unifdef-y += signalfd.h unifdef-y += ext2_fs.h +unifdef-y += fanotify.h unifdef-y += fb.h unifdef-y += fcntl.h unifdef-y += filter.h |