diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-08 09:54:35 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 09:54:35 -0500 |
| commit | cc1b39dbf9f55a438e8a21a694394c20e6a17129 (patch) | |
| tree | cf48e5c871250c2bfd1d0590acd2f0569e95b950 /arch/sh | |
| parent | 7e0dd574cd6b1bcc818ed4251e5ceda7d8bee08f (diff) | |
| parent | 1c7d66732458dc187008e3f5b2f71e019e320fc2 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull ftrace updates from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild index 29f83beeef7a..280bea9e5e2b 100644 --- a/arch/sh/include/asm/Kbuild +++ b/arch/sh/include/asm/Kbuild | |||
| @@ -31,5 +31,6 @@ generic-y += socket.h | |||
| 31 | generic-y += statfs.h | 31 | generic-y += statfs.h |
| 32 | generic-y += termbits.h | 32 | generic-y += termbits.h |
| 33 | generic-y += termios.h | 33 | generic-y += termios.h |
| 34 | generic-y += trace_clock.h | ||
| 34 | generic-y += ucontext.h | 35 | generic-y += ucontext.h |
| 35 | generic-y += xor.h | 36 | generic-y += xor.h |