diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-22 10:42:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-22 10:42:23 +1000 |
| commit | be21d065e6d1443c0720d76502513c5efe418403 (patch) | |
| tree | 623a67a7f7beb744535032ceba6ac2d11dd46c53 /kernel/Makefile | |
| parent | 44fbdd467bea6c7fadab795176a15da167b86859 (diff) | |
| parent | cdca408f6f55290eec706abad51826e113f2a091 (diff) | |
Merge commit 'ftrace/auto-ftrace-next'
Conflicts:
kernel/module.c
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 4e1d7df7c3e2..8f9ce7ec21b6 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -83,6 +83,7 @@ obj-$(CONFIG_SYSCTL) += utsname_sysctl.o obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o obj-$(CONFIG_MARKERS) += marker.o +obj-$(CONFIG_TRACEPOINTS) += tracepoint.o obj-$(CONFIG_LATENCYTOP) += latencytop.o obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o obj-$(CONFIG_FTRACE) += trace/ |