diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-11 17:36:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-11 17:36:52 -0800 |
| commit | 07f80d41cf24b7e6e76cd97d420167932c9a7f82 (patch) | |
| tree | 86ee28ad0e085d96a94986c1efdada11d5457139 /fs/pstore/Makefile | |
| parent | 6f83e5bd3e96228ee0caff0b103addb5f4e95459 (diff) | |
| parent | a6b8978c54b771308f6f1692b9735ac0bb087cc2 (diff) | |
Merge tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull pstore update from Tony Luck:
"Miscellaneous fs/pstore fixes"
* tag 'please-pull-pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
pstore: Fix sprintf format specifier in pstore_dump()
pstore: Add pmsg - user-space accessible pstore object
pstore: Handle zero-sized prz in series
pstore: Remove superfluous memory size check
pstore: Use scnprintf() in pstore_mkfile()
Diffstat (limited to 'fs/pstore/Makefile')
| -rw-r--r-- | fs/pstore/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/pstore/Makefile b/fs/pstore/Makefile index 4c9095c2781..e647d8e8171 100644 --- a/fs/pstore/Makefile +++ b/fs/pstore/Makefile @@ -7,5 +7,7 @@ obj-y += pstore.o pstore-objs += inode.o platform.o obj-$(CONFIG_PSTORE_FTRACE) += ftrace.o +obj-$(CONFIG_PSTORE_PMSG) += pmsg.o + ramoops-objs += ram.o ram_core.o obj-$(CONFIG_PSTORE_RAM) += ramoops.o |