diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-11-26 03:48:18 (GMT) |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-11-26 03:48:18 (GMT) |
| commit | b3d6cfd09184dcea17f7d8e29c71fafe58bb5f00 (patch) | |
| tree | 8be4c2cc6caf1e7a5d31401f3f2e960110df6ebd /kernel/Makefile | |
| parent | 389c74aaace1ae2a423184b03d8198311fef2c7d (diff) | |
| parent | 2fbbc96d16009276153fd33823616877dcca30d8 (diff) | |
| download | linux-b3d6cfd09184dcea17f7d8e29c71fafe58bb5f00.tar.xz | |
Merge tag 'tags/phy-dt-header' into mvebu/dt-usb_phy
shared header file which will be referenced from both
PHY driver and its associated Device Tree node(s)
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index dc5c775..17ea6d4 100644 --- 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/ |