Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 5f4c45d..ded2ffb 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -215,9 +215,12 @@ source "fs/pstore/Kconfig"
 source "fs/sysv/Kconfig"
 source "fs/ufs/Kconfig"
 source "fs/exofs/Kconfig"
+source "fs/aufs/Kconfig"
 
 endif # MISC_FILESYSTEMS
 
+source "fs/exofs/Kconfig.ore"
+
 menuconfig NETWORK_FILESYSTEMS
        bool "Network File Systems"
        default y