summaryrefslogtreecommitdiff
path: root/fs/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-17 05:01:29 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-17 05:01:29 +0300
commit242e5d06be2ad2633c85313a37862e03f4450a46 (patch)
tree9a75e5efed6ee9a4f5d9769b851ab503c1fb5ef2 /fs/Kconfig
parent4c5811bf463b0ef82fabbd1708f8bb2d753aeb18 (diff)
parentafe997a183ecc0be72652c7a5ce2152bdf91724e (diff)
downloadlinux-242e5d06be2ad2633c85313a37862e03f4450a46.tar.xz
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] tioca: Fix assignment from incompatible pointer warnings [IA64] mca.c: Fix cast from integer to pointer warning [IA64] setup.c Typo fix "Architechtuallly" [IA64] Add CONFIG_MISC_DEVICES=y to configs that need it. [IA64] disable interrupts at end of ia64_mca_cpe_int_handler() [IA64] Add DMA_ERROR_CODE define. pstore: fix build warning for unused return value from sysfs_create_file pstore: X86 platform interface using ACPI/APEI/ERST pstore: new filesystem interface to platform persistent storage
Diffstat (limited to 'fs/Kconfig')
-rw-r--r--fs/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 7cb53aafac1e..f3aa9b08b228 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -187,6 +187,7 @@ source "fs/omfs/Kconfig"
source "fs/hpfs/Kconfig"
source "fs/qnx4/Kconfig"
source "fs/romfs/Kconfig"
+source "fs/pstore/Kconfig"
source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/exofs/Kconfig"