diff options
| author | Mingming Cao <cmm@us.ibm.com> | 2006-10-11 04:20:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-11 14:14:15 -0400 |
| commit | 617ba13b31fbf505cc21799826639ef24ed94af0 (patch) | |
| tree | 2a41e8c993f7c1eed115ad24047d546ba56cbdf5 /fs/ext4/Makefile | |
| parent | ac27a0ec112a089f1a5102bc8dffc79c8c815571 (diff) | |
[PATCH] ext4: rename ext4 symbols to avoid duplication of ext3 symbols
Mingming Cao originally did this work, and Shaggy reproduced it using some
scripts from her.
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/ext4/Makefile')
| -rw-r--r-- | fs/ext4/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ext4/Makefile b/fs/ext4/Makefile index 704cd44a40c2..09c487893e4a 100644 --- a/fs/ext4/Makefile +++ b/fs/ext4/Makefile | |||
| @@ -1,12 +1,12 @@ | |||
| 1 | # | 1 | # |
| 2 | # Makefile for the linux ext3-filesystem routines. | 2 | # Makefile for the linux ext4-filesystem routines. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-$(CONFIG_EXT3_FS) += ext3.o | 5 | obj-$(CONFIG_EXT4DEV_FS) += ext4dev.o |
| 6 | 6 | ||
| 7 | ext3-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ | 7 | ext4dev-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 | 8 | ioctl.o namei.o super.o symlink.o hash.o resize.o |
| 9 | 9 | ||
| 10 | ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o | 10 | ext4dev-$(CONFIG_EXT4DEV_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o |
| 11 | ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o | 11 | ext4dev-$(CONFIG_EXT4DEV_FS_POSIX_ACL) += acl.o |
| 12 | ext3-$(CONFIG_EXT3_FS_SECURITY) += xattr_security.o | 12 | ext4dev-$(CONFIG_EXT4DEV_FS_SECURITY) += xattr_security.o |