Merge branches 'release' and 'dmi' into release

[sfrench/cifs-2.6.git] / fs / ext2 / Makefile

diff --git a/fs/ext2/Makefile b/fs/ext2/Makefile
index c5d02da73bc3dd192d42465bc544f719ab2cba90..e0b2b43c1fdb956115e18423d19f886ca6c7272d 100644 (file)
--- a/fs/ext2/Makefile
+++ b/fs/ext2/Makefile
@@ -4,7 +4,7 @@
 
 obj-$(CONFIG_EXT2_FS) += ext2.o
 
-ext2-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
+ext2-y := balloc.o dir.o file.o fsync.o ialloc.o inode.o \
          ioctl.o namei.o super.o symlink.o
 
 ext2-$(CONFIG_EXT2_FS_XATTR)    += xattr.o xattr_user.o xattr_trusted.o