diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:51:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 15:51:01 -0500 |
| commit | 9e203936eac786f9268d6a13e6442d2accef1829 (patch) | |
| tree | 1da906e1c099b3afacf3b358b8981931c4da45fd /fs/Kconfig | |
| parent | 993ecff81aa6d50d694704de2647a5529ff2f166 (diff) | |
| parent | 724577ca355795b0a25c93ccbeee927871ca1a77 (diff) | |
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/Kconfig | 2 |
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" | |||
| 218 | 218 | ||
| 219 | endif # MISC_FILESYSTEMS | 219 | endif # MISC_FILESYSTEMS |
| 220 | 220 | ||
| 221 | source "fs/exofs/Kconfig.ore" | ||
| 222 | |||
| 221 | menuconfig NETWORK_FILESYSTEMS | 223 | menuconfig NETWORK_FILESYSTEMS |
| 222 | bool "Network File Systems" | 224 | bool "Network File Systems" |
| 223 | default y | 225 | default y |