1 files changed, 5 insertions, 5 deletions
diff --git a/fs/ext4/Makefile b/fs/ext4/Makefile
index ac6fa8ca0a2f..a8ff003a00f7 100644
--- a/fs/ext4/Makefile
+++ b/fs/ext4/Makefile
@@ -2,12 +2,12 @@
 # Makefile for the linux ext4-filesystem routines.
 #
-obj-$(CONFIG_EXT4DEV_FS) += ext4dev.o
+obj-$(CONFIG_EXT4_FS) += ext4.o
-ext4dev-y       := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
+ext4-y  := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
                   ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \
                   ext4_jbd2.o migrate.o mballoc.o
-ext4dev-$(CONFIG_EXT4DEV_FS_XATTR)      += xattr.o xattr_user.o xattr_trusted.o
+ext4-$(CONFIG_EXT4_FS_XATTR)            += xattr.o xattr_user.o xattr_trusted.o
-ext4dev-$(CONFIG_EXT4DEV_FS_POSIX_ACL)  += acl.o
+ext4-$(CONFIG_EXT4_FS_POSIX_ACL)        += acl.o
-ext4dev-$(CONFIG_EXT4DEV_FS_SECURITY)   += xattr_security.o
+ext4-$(CONFIG_EXT4_FS_SECURITY)         += xattr_security.o

diff --git a/fs/ext4/Makefile b/fs/ext4/Makefile index ac6fa8ca0a2f..a8ff003a00f7 100644 --- a/fs/ext4/Makefile +++ b/fs/ext4/Makefile
@@ -2,12 +2,12 @@
2	# Makefile for the linux ext4-filesystem routines.	2	# Makefile for the linux ext4-filesystem routines.
3	#	3	#
4		4
5	obj-$(CONFIG_EXT4DEV_FS) += ext4dev.o	5	obj-$(CONFIG_EXT4_FS) += ext4.o
6		6
7	ext4dev-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \	7	ext4-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
8	ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \	8	ioctl.o namei.o super.o symlink.o hash.o resize.o extents.o \
9	ext4_jbd2.o migrate.o mballoc.o	9	ext4_jbd2.o migrate.o mballoc.o
10		10
11	ext4dev-$(CONFIG_EXT4DEV_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o	11	ext4-$(CONFIG_EXT4_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o
12	ext4dev-$(CONFIG_EXT4DEV_FS_POSIX_ACL) += acl.o	12	ext4-$(CONFIG_EXT4_FS_POSIX_ACL) += acl.o
13	ext4dev-$(CONFIG_EXT4DEV_FS_SECURITY) += xattr_security.o	13	ext4-$(CONFIG_EXT4_FS_SECURITY) += xattr_security.o