diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 19:01:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 19:01:29 -0700 |
| commit | 242e5d06be2ad2633c85313a37862e03f4450a46 (patch) | |
| tree | 9a75e5efed6ee9a4f5d9769b851ab503c1fb5ef2 /fs/Makefile | |
| parent | 4c5811bf463b0ef82fabbd1708f8bb2d753aeb18 (diff) | |
| parent | afe997a183ecc0be72652c7a5ce2152bdf91724e (diff) | |
| download | linux-242e5d06be2ad2633c85313a37862e03f4450a46.tar.bz2 | |
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/Makefile')
| -rw-r--r-- | fs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index ba01202844c5..fb68c2b8cf8a 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -123,3 +123,4 @@ obj-$(CONFIG_BTRFS_FS) += btrfs/ obj-$(CONFIG_GFS2_FS) += gfs2/ obj-$(CONFIG_EXOFS_FS) += exofs/ obj-$(CONFIG_CEPH_FS) += ceph/ +obj-$(CONFIG_PSTORE) += pstore/ |