diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 15:05:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 15:05:00 -0400 |
| commit | b9d40b7b1e349bdc5c174b4ef1a333e62f7d749c (patch) | |
| tree | f5c2d85ffb1f1dd21ae8254723ea9c595cf200d5 /include/linux | |
| parent | 7c1632ba76d94b4847fde79f67faa91ef8571fe9 (diff) | |
| parent | e13dbd7d75d1ecc315c6e3071b3c4e8fba4f6bec (diff) | |
Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf_events: Make ABI definitions available to userspace
perf tools: elf_sym__is_function() should accept "zero" sized functions
tracing/syscalls: Use long for syscall ret format and field definitions
perf trace: Update eval_flag() flags array to match interrupt.h
perf trace: Remove unused code in builtin-trace.c
perf: Propagate term signal to child
Diffstat (limited to 'include/linux')
| -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 cff4a101f266..3f384d4b163a 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -126,6 +126,7 @@ header-y += nfs_mount.h | |||
| 126 | header-y += nl80211.h | 126 | header-y += nl80211.h |
| 127 | header-y += param.h | 127 | header-y += param.h |
| 128 | header-y += pci_regs.h | 128 | header-y += pci_regs.h |
| 129 | header-y += perf_event.h | ||
| 129 | header-y += pfkeyv2.h | 130 | header-y += pfkeyv2.h |
| 130 | header-y += pg.h | 131 | header-y += pg.h |
| 131 | header-y += phantom.h | 132 | header-y += phantom.h |