projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into tracing/hw-breakpoints
[linux-2.6-block.git]
/
kernel
/
Makefile
diff --git
a/kernel/Makefile
b/kernel/Makefile
index 9df4501cb92158d64ac3db254f7ae9e4ca93d22c..f88decb1b4452c3557c3c145095b7306dfaf992e 100644
(file)
--- a/
kernel/Makefile
+++ b/
kernel/Makefile
@@
-97,6
+97,7
@@
obj-$(CONFIG_TRACING) += trace/
obj-$(CONFIG_X86_DS) += trace/
obj-$(CONFIG_SMP) += sched_cpupri.o
obj-$(CONFIG_SLOW_WORK) += slow-work.o
+obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o
ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)