diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-03-04 02:10:23 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-04 06:26:06 +0100 |
commit | cec9166ca4e586de389b0f3c43a8103e728d92ec (patch) | |
tree | 54b647d8dfad5675f4137f2eedab1889b7d12993 /net/Makefile | |
parent | Merge branch 'neigh-mpls-prep' (diff) | |
download | linux-cec9166ca4e586de389b0f3c43a8103e728d92ec.tar.xz linux-cec9166ca4e586de389b0f3c43a8103e728d92ec.zip |
mpls: Refactor how the mpls module is built
This refactoring is needed to allow more than just mpls gso
support to be built into the mpls moddule.
Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/Makefile')
-rw-r--r-- | net/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/Makefile b/net/Makefile index 38704bdf941a..3995613e5510 100644 --- 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/ |