summaryrefslogtreecommitdiffstats
path: root/fs/ntfs/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-16 11:47:51 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-16 11:47:51 -0700
commitaf6ea9ca23504fe620412826a420dca9c43a8bf6 (patch)
tree19bebbeb442a8d08ad29f2056665b5fdd9bf1478 /fs/ntfs/Makefile
parent1fa4aad496b9c96fcde6c8f905a43ae6733e5a79 (diff)
parentc514720716c7b109ff980f8b3cb93f9af872c91c (diff)
downloadop-kernel-dev-af6ea9ca23504fe620412826a420dca9c43a8bf6.zip
op-kernel-dev-af6ea9ca23504fe620412826a420dca9c43a8bf6.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6
Diffstat (limited to 'fs/ntfs/Makefile')
-rw-r--r--fs/ntfs/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile
index 7b66381..f083f27 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
OpenPOWER on IntegriCloud