diff options
author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-27 00:06:06 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 00:06:06 +0200 |
commit | aef7b83c92dd0b7e994805440655d1d64147287b (patch) | |
tree | 981f373358c1988e061625e8f272013065cb086f /fs/nfsd/Makefile | |
parent | [netdrvr] Fix register_netdev() races in older ISA net drivers (diff) | |
parent | Merge 'drm-3264' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
download | linux-aef7b83c92dd0b7e994805440655d1d64147287b.tar.xz linux-aef7b83c92dd0b7e994805440655d1d64147287b.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/nfsd/Makefile')
-rw-r--r-- | fs/nfsd/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nfsd/Makefile b/fs/nfsd/Makefile index b8680a247f8b..ce341dc76d5e 100644 --- a/fs/nfsd/Makefile +++ b/fs/nfsd/Makefile @@ -6,7 +6,9 @@ obj-$(CONFIG_NFSD) += nfsd.o nfsd-y := nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \ export.o auth.o lockd.o nfscache.o nfsxdr.o stats.o +nfsd-$(CONFIG_NFSD_V2_ACL) += nfs2acl.o nfsd-$(CONFIG_NFSD_V3) += nfs3proc.o nfs3xdr.o +nfsd-$(CONFIG_NFSD_V3_ACL) += nfs3acl.o nfsd-$(CONFIG_NFSD_V4) += nfs4proc.o nfs4xdr.o nfs4state.o nfs4idmap.o \ - nfs4acl.o nfs4callback.o + nfs4acl.o nfs4callback.o nfs4recover.o nfsd-objs := $(nfsd-y) |