projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf
[cascardo/linux.git]
/
fs
/
pstore
/
Makefile
diff --git
a/fs/pstore/Makefile
b/fs/pstore/Makefile
index
4c9095c
..
e647d8e
100644
(file)
--- 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