summaryrefslogtreecommitdiffstats
path: root/fs/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 12:51:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-09 12:51:01 -0800
commit9e203936eac786f9268d6a13e6442d2accef1829 (patch)
tree1da906e1c099b3afacf3b358b8981931c4da45fd /fs/Kconfig
parent993ecff81aa6d50d694704de2647a5529ff2f166 (diff)
parent724577ca355795b0a25c93ccbeee927871ca1a77 (diff)
downloadlinux-9e203936eac786f9268d6a13e6442d2accef1829.tar.bz2
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd: ore: Must support none-PAGE-aligned IO ore: fix BUG_ON, too few sgs when reading ore: Fix crash in case of an IO error. ore: FIX breakage when MISC_FILESYSTEMS is not set
Diffstat (limited to 'fs/Kconfig')
-rw-r--r--fs/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 30145d886bc2..d621f02a3f9e 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -218,6 +218,8 @@ source "fs/exofs/Kconfig"
endif # MISC_FILESYSTEMS
+source "fs/exofs/Kconfig.ore"
+
menuconfig NETWORK_FILESYSTEMS
bool "Network File Systems"
default y