diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 08:48:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-03 08:48:21 -0700 |
| commit | eb0ad9c06d51edb5d18a7007fd4d77a8805b2ba7 (patch) | |
| tree | 987595aa0cfa6e9fdf367a1ec3f5e8b04849c777 /fs/jfs/Makefile | |
| parent | 1f7df953d687860690cc0e388d0efec215c09e9c (diff) | |
| parent | 84f4141ee3ea11035f741d4298cb6bbad1850fcf (diff) | |
| download | op-kernel-dev-eb0ad9c06d51edb5d18a7007fd4d77a8805b2ba7.zip op-kernel-dev-eb0ad9c06d51edb5d18a7007fd4d77a8805b2ba7.tar.gz | |
Merge tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy
Pull JFS update from Dave Kleikamp:
"JFS TRIM support and some minor fixes"
* tag 'jfs-3.7' of git://github.com/kleikamp/linux-shaggy:
jfs: Fix do_div precision in commit b40c2e66
JFS: use list_move instead of list_del/list_add
jfs: Remove obsolete email address
fs/jfs: TRIM support for JFS Filesystem
Diffstat (limited to 'fs/jfs/Makefile')
| -rw-r--r-- | fs/jfs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jfs/Makefile b/fs/jfs/Makefile index a58fa72..d20d473 100644 --- a/fs/jfs/Makefile +++ b/fs/jfs/Makefile @@ -6,7 +6,7 @@ obj-$(CONFIG_JFS_FS) += jfs.o jfs-y := super.o file.o inode.o namei.o jfs_mount.o jfs_umount.o \ jfs_xtree.o jfs_imap.o jfs_debug.o jfs_dmap.o \ - jfs_unicode.o jfs_dtree.o jfs_inode.o \ + jfs_unicode.o jfs_dtree.o jfs_inode.o jfs_discard.o \ jfs_extent.o symlink.o jfs_metapage.o \ jfs_logmgr.o jfs_txnmgr.o jfs_uniupr.o \ resize.o xattr.o ioctl.o |
