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 /drivers/target/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 'drivers/target/Makefile')
-rw-r--r-- | drivers/target/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/target/Makefile b/drivers/target/Makefile index 85b012d2f89b..bbb4a7d638ef 100644 --- a/drivers/target/Makefile +++ b/drivers/target/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_TARGET_CORE) += target_core_mod.o obj-$(CONFIG_TCM_IBLOCK) += target_core_iblock.o obj-$(CONFIG_TCM_FILEIO) += target_core_file.o obj-$(CONFIG_TCM_PSCSI) += target_core_pscsi.o +obj-$(CONFIG_TCM_USER) += target_core_user.o # Fabric modules obj-$(CONFIG_LOOPBACK_TARGET) += loopback/ |