diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-24 12:29:39 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 12:29:39 -0500 |
| commit | 4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99 (patch) | |
| tree | c4ff89dc09abe69d58db1e14da22ecda9fdd3ce8 /fs/ntfs/Makefile | |
| parent | 84ac69e8bf9f36eb0166817373336d14fa58f5cc (diff) | |
| parent | aec5c3c1a929d7d79a420e943285cf3ba26a7c0d (diff) | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/libata-core.c
Diffstat (limited to 'fs/ntfs/Makefile')
| -rw-r--r-- | fs/ntfs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/Makefile b/fs/ntfs/Makefile index d95fac7fdeb..e27b4eacffb 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.26\" +EXTRA_CFLAGS = -DNTFS_VERSION=\"2.1.27\" ifeq ($(CONFIG_NTFS_DEBUG),y) EXTRA_CFLAGS += -DDEBUG |