git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[sfrench/cifs-2.6.git]
/
fs
/
Makefile
diff --git
a/fs/Makefile
b/fs/Makefile
index ba01202844c5ab248931fff41e5546f31febbafc..fb68c2b8cf8a73626bc2900048a0d4928993c365 100644
(file)
--- 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/