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/Kconfig | |
| 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/Kconfig')
| -rw-r--r-- | fs/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 84ab76a206a0..17216ba99c85 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -1375,6 +1375,9 @@ config JFFS2_CMODE_FAVOURLZO | |||
| 1375 | 1375 | ||
| 1376 | endchoice | 1376 | endchoice |
| 1377 | 1377 | ||
| 1378 | # UBIFS File system configuration | ||
| 1379 | source "fs/ubifs/Kconfig" | ||
| 1380 | |||
| 1378 | config CRAMFS | 1381 | config CRAMFS |
| 1379 | tristate "Compressed ROM file system support (cramfs)" | 1382 | tristate "Compressed ROM file system support (cramfs)" |
| 1380 | depends on BLOCK | 1383 | depends on BLOCK |