diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 16:18:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 16:18:03 -0500 |
| commit | 66b89159c25a47d2177743526c61b5ada7acc39e (patch) | |
| tree | b092b859ca01d7544a666c95f940144b0ef3b35b /lib/Kconfig | |
| parent | 87c7ae06cc50bcbcdcc60d64a959ca0b9b71f892 (diff) | |
| parent | c2f843f03d658e9ab2a1a455f2c1851fd6a869af (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
* git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
[LogFS] Change magic number
[LogFS] Remove h_version field
[LogFS] Check feature flags
[LogFS] Only write journal if dirty
[LogFS] Fix bdev erases
[LogFS] Silence gcc
[LogFS] Prevent 64bit divisions in hash_index
[LogFS] Plug memory leak on error paths
[LogFS] Add MAINTAINERS entry
[LogFS] add new flash file system
Fixed up trivial conflict in lib/Kconfig, and a semantic conflict in
fs/logfs/inode.c introduced by write_inode() being changed to use
writeback_control' by commit a9185b41a4f84971b930c519f0c63bd450c4810d
("pass writeback_control to ->write_inode")
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 8034c46327c..496d16e1fa2 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -163,6 +163,9 @@ config TEXTSEARCH_FSM | |||
| 163 | config LIST_SORT | 163 | config LIST_SORT |
| 164 | boolean | 164 | boolean |
| 165 | 165 | ||
| 166 | config BTREE | ||
| 167 | boolean | ||
| 168 | |||
| 166 | config HAS_IOMEM | 169 | config HAS_IOMEM |
| 167 | boolean | 170 | boolean |
| 168 | depends on !NO_IOMEM | 171 | depends on !NO_IOMEM |