diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 18:02:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-16 18:02:57 -0400 |
| commit | 9c1be0c4712fe760d8969427ef91107e9c062d91 (patch) | |
| tree | 01210aba49c120116bb99ba031ff86a525ffb63d /fs/Makefile | |
| parent | 42fdd144a40f3afaccaa7ea538268bad3596439e (diff) | |
| parent | 0d7eff873caaeac84de01a1acdca983d2c7ba3fe (diff) | |
Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6
* 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6:
UBIFS: include to compilation
UBIFS: add new flash file system
UBIFS: add brief documentation
MAINTAINERS: add UBIFS section
do_mounts: allow UBI root device name
VFS: export sync_sb_inodes
VFS: move inode_lock into sync_sb_inodes
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index 277b079dec9e..3b2178b4bb66 100644 --- a/fs/Makefile +++ b/fs/Makefile | |||
| @@ -101,6 +101,7 @@ obj-$(CONFIG_NTFS_FS) += ntfs/ | |||
| 101 | obj-$(CONFIG_UFS_FS) += ufs/ | 101 | obj-$(CONFIG_UFS_FS) += ufs/ |
| 102 | obj-$(CONFIG_EFS_FS) += efs/ | 102 | obj-$(CONFIG_EFS_FS) += efs/ |
| 103 | obj-$(CONFIG_JFFS2_FS) += jffs2/ | 103 | obj-$(CONFIG_JFFS2_FS) += jffs2/ |
| 104 | obj-$(CONFIG_UBIFS_FS) += ubifs/ | ||
| 104 | obj-$(CONFIG_AFFS_FS) += affs/ | 105 | obj-$(CONFIG_AFFS_FS) += affs/ |
| 105 | obj-$(CONFIG_ROMFS_FS) += romfs/ | 106 | obj-$(CONFIG_ROMFS_FS) += romfs/ |
| 106 | obj-$(CONFIG_QNX4FS_FS) += qnx4/ | 107 | obj-$(CONFIG_QNX4FS_FS) += qnx4/ |