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

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 84ab76a206a0ce9186c123c7b249dac2b5fc653b..17216ba99c8528f11e2c3e4456d32eebfd9f2c5c 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