Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[deliverable/linux.git] / fs / ext4 / Makefile

diff --git a/fs/ext4/Makefile b/fs/ext4/Makefile
index f52cf54f0cbc4ceb6c236a4d4ae404a3282cd0a0..354103f3490c3cba719b64a8d0f297200fde67e6 100644 (file)
--- a/fs/ext4/Makefile
+++ b/fs/ext4/Makefile
@@ -12,5 +12,3 @@ ext4-y        := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o page-io.o \
 
 ext4-$(CONFIG_EXT4_FS_POSIX_ACL)       += acl.o
 ext4-$(CONFIG_EXT4_FS_SECURITY)                += xattr_security.o
-ext4-$(CONFIG_EXT4_FS_ENCRYPTION)      += crypto_policy.o crypto.o \
-               crypto_key.o crypto_fname.o