diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 17:49:39 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 17:49:39 -0400 |
commit | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (patch) | |
tree | 42a0c0408fcf76024eb6885a27d4f1ed0228abcf /fs/ntfs/Makefile | |
parent | ce625a801664d8ed7344117bbb57510e4e0e872c (diff) | |
parent | f60f700876cd51de9de69f3a3c865d95e287a24d (diff) | |
download | kernel-crypto-39299d9d15c41cbdd7c7009967cd35afaf34d8fa.tar.gz kernel-crypto-39299d9d15c41cbdd7c7009967cd35afaf34d8fa.tar.xz kernel-crypto-39299d9d15c41cbdd7c7009967cd35afaf34d8fa.zip |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'fs/ntfs/Makefile')
-rw-r--r-- | fs/ntfs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile index 7b66381a0b0..f083f27d8b6 100644 --- a/fs/ntfs/Makefile +++ b/fs/ntfs/Makefile @@ -6,7 +6,7 @@ ntfs-objs := aops.o attrib.o collate.o compress.o debug.o dir.o file.o \ index.o inode.o mft.o mst.o namei.o runlist.o super.o sysctl.o \ unistr.o upcase.o -EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.22\" +EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.23\" ifeq ($(CONFIG_NTFS_DEBUG),y) EXTRA_CFLAGS += -DDEBUG @@ -15,5 +15,5 @@ endif ifeq ($(CONFIG_NTFS_RW),y) EXTRA_CFLAGS += -DNTFS_RW -ntfs-objs += bitmap.o lcnalloc.o logfile.o quota.o +ntfs-objs += bitmap.o lcnalloc.o logfile.o quota.o usnjrnl.o endif |