aboutsummaryrefslogtreecommitdiffstats
path: root/fs/9p/Makefile
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-11-25 10:56:40 -0800
committerTony Lindgren <tony@atomide.com>2015-11-25 10:56:40 -0800
commit970259bff472579204108c6f27036ec4d1206ae1 (patch)
tree869bdcda9aac4c67712d93e6141056fdf3f41bd8 /fs/9p/Makefile
parentARM: OMAP2+: remove custom abort handler for t410 (diff)
parentarm: omap2+: add missing HWMOD_NO_IDLEST in 81xx hwmod data (diff)
downloadlinux-dev-970259bff472579204108c6f27036ec4d1206ae1.tar.xz
linux-dev-970259bff472579204108c6f27036ec4d1206ae1.zip
Merge branch '81xx' into omap-for-v4.4/fixes
Diffstat (limited to 'fs/9p/Makefile')
-rw-r--r--fs/9p/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/9p/Makefile b/fs/9p/Makefile
index ff7be98f84f2..9619ccadd2fc 100644
--- a/fs/9p/Makefile
+++ b/fs/9p/Makefile
@@ -10,10 +10,7 @@ obj-$(CONFIG_9P_FS) := 9p.o
vfs_dentry.o \
v9fs.o \
fid.o \
- xattr.o \
- xattr_user.o \
- xattr_trusted.o
+ xattr.o
9p-$(CONFIG_9P_FSCACHE) += cache.o
9p-$(CONFIG_9P_FS_POSIX_ACL) += acl.o
-9p-$(CONFIG_9P_FS_SECURITY) += xattr_security.o