diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 18:06:30 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-11-19 18:06:30 +0100 |
| commit | 56429e9b3be567a173bd05f5594faf8522c34d3a (patch) | |
| tree | d218d430ed992cdfa42da084bf36e5aa3c2ecb26 /net/mpls/Makefile | |
| parent | nfsd: convert nfs4_file searches to use RCU (diff) | |
| parent | SUNRPC: Fix locking around callback channel reply receive (diff) | |
| download | linux-56429e9b3be567a173bd05f5594faf8522c34d3a.tar.xz linux-56429e9b3be567a173bd05f5594faf8522c34d3a.zip | |
merge nfs bugfixes into nfsd for-3.19 branch
In addition to nfsd bugfixes, there are some fixes in -rc5 for client
bugs that can interfere with my testing.
Diffstat (limited to 'net/mpls/Makefile')
| -rw-r--r-- | net/mpls/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mpls/Makefile b/net/mpls/Makefile index 0a3c171be537..6dec088c2d0f 100644 --- a/net/mpls/Makefile +++ b/net/mpls/Makefile @@ -1,4 +1,4 @@ # # Makefile for MPLS. # -obj-y += mpls_gso.o +obj-$(CONFIG_NET_MPLS_GSO) += mpls_gso.o |