projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.19-rockchip-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
kernel
/
Makefile
diff --git
a/kernel/Makefile
b/kernel/Makefile
index
dc5c775
..
17ea6d4
100644
(file)
--- a/
kernel/Makefile
+++ b/
kernel/Makefile
@@
-86,7
+86,7
@@
obj-$(CONFIG_RING_BUFFER) += trace/
obj-$(CONFIG_TRACEPOINTS) += trace/
obj-$(CONFIG_IRQ_WORK) += irq_work.o
obj-$(CONFIG_CPU_PM) += cpu_pm.o
-obj-$(CONFIG_
NET
) += bpf/
+obj-$(CONFIG_
BPF
) += bpf/
obj-$(CONFIG_PERF_EVENTS) += events/