summaryrefslogtreecommitdiff
path: root/net/mpls/Makefile
diff options
context:
space:
mode:
authorRobert Shearman <rshearma@brocade.com>2015-03-10 19:37:59 +0300
committerDavid S. Miller <davem@davemloft.net>2015-03-11 23:38:54 +0300
commit8a08919f43d9955d5afc5d6b416964401e3c58d8 (patch)
tree489b040e5c3be91081d5a4fedaa121478457efc4 /net/mpls/Makefile
parent19693f1166a421e628136ecc279bb4a076b753eb (diff)
downloadlinux-8a08919f43d9955d5afc5d6b416964401e3c58d8.tar.xz
mpls: Allow mpls_gso and mpls_router to be built as modules
CONFIG_MPLS=m doesn't result in a kernel module being built because it applies to the net/mpls directory, rather than to .o files. So revert the MPLS menuitem to being a boolean and make MPLS_GSO and MPLS_ROUTING tristates to allow mpls_gso and mpls_router modules to be produced as desired. Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Robert Shearman <rshearma@brocade.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls/Makefile')
-rw-r--r--net/mpls/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mpls/Makefile b/net/mpls/Makefile
index 60af15f1960e..65bbe68c72e6 100644
--- a/net/mpls/Makefile
+++ b/net/mpls/Makefile
@@ -2,4 +2,6 @@
# Makefile for MPLS.
#
obj-$(CONFIG_NET_MPLS_GSO) += mpls_gso.o
-obj-$(CONFIG_MPLS_ROUTING) += af_mpls.o
+obj-$(CONFIG_MPLS_ROUTING) += mpls_router.o
+
+mpls_router-y := af_mpls.o