Merge branch 'for_linus' of git://git.infradead.org/~dedekind/ubifs-2.6

[cascardo/linux.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 84ab76a..17216ba 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1375,6 +1375,9 @@ config JFFS2_CMODE_FAVOURLZO
 
 endchoice
 
+# UBIFS File system configuration
+source "fs/ubifs/Kconfig"
+
 config CRAMFS
        tristate "Compressed ROM file system support (cramfs)"
        depends on BLOCK