diff options
| author | Robert Shearman <rshearma@brocade.com> | 2015-03-10 12:37:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-11 16:38:54 -0400 |
| commit | 8a08919f43d9955d5afc5d6b416964401e3c58d8 (patch) | |
| tree | 489b040e5c3be91081d5a4fedaa121478457efc4 /net/mpls/Makefile | |
| parent | 19693f1166a421e628136ecc279bb4a076b753eb (diff) | |
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/Makefile | 4 |
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 @@ | |||
| 2 | # Makefile for MPLS. | 2 | # Makefile for MPLS. |
| 3 | # | 3 | # |
| 4 | obj-$(CONFIG_NET_MPLS_GSO) += mpls_gso.o | 4 | obj-$(CONFIG_NET_MPLS_GSO) += mpls_gso.o |
| 5 | obj-$(CONFIG_MPLS_ROUTING) += af_mpls.o | 5 | obj-$(CONFIG_MPLS_ROUTING) += mpls_router.o |
| 6 | |||
| 7 | mpls_router-y := af_mpls.o | ||