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 'trace-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[cascardo/linux.git]
/
net
/
hsr
/
Makefile
diff --git
a/net/hsr/Makefile
b/net/hsr/Makefile
index
b68359f
..
9ae972a
100644
(file)
--- a/
net/hsr/Makefile
+++ b/
net/hsr/Makefile
@@
-4,4
+4,5
@@
obj-$(CONFIG_HSR) += hsr.o
-hsr-y := hsr_main.o hsr_framereg.o hsr_device.o hsr_netlink.o
+hsr-y := hsr_main.o hsr_framereg.o hsr_device.o \
+ hsr_netlink.o hsr_slave.o hsr_forward.o