projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'gpio-v4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...
[firefly-linux-kernel-4.4.55.git]
/
net
/
Makefile
diff --git
a/net/Makefile
b/net/Makefile
index 38704bdf941ad6697db492959a909ca716ea9d4c..3995613e5510cfd6a05ebfe5cbbd9da3bcb5589f 100644
(file)
--- a/
net/Makefile
+++ b/
net/Makefile
@@
-69,7
+69,7
@@
obj-$(CONFIG_BATMAN_ADV) += batman-adv/
obj-$(CONFIG_NFC) += nfc/
obj-$(CONFIG_OPENVSWITCH) += openvswitch/
obj-$(CONFIG_VSOCKETS) += vmw_vsock/
-obj-$(CONFIG_
NET_MPLS_GSO)
+= mpls/
+obj-$(CONFIG_
MPLS)
+= mpls/
obj-$(CONFIG_HSR) += hsr/
ifneq ($(CONFIG_NET_SWITCHDEV),)
obj-y += switchdev/