summaryrefslogtreecommitdiff
path: root/fs/Makefile
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2011-03-16 09:58:31 -0700
committerTony Luck <tony.luck@intel.com>2011-03-16 09:58:31 -0700
commitafe997a183ecc0be72652c7a5ce2152bdf91724e (patch)
tree307ec69f546700d1aac7a9bc23853f6e4ae875a0 /fs/Makefile
parent4897313a62cf0b106e9e861bf7350a9cfc0715d0 (diff)
parent168f2e14319aba3125946649604e858cbae85be6 (diff)
downloadlinux-3.10-afe997a183ecc0be72652c7a5ce2152bdf91724e.tar.gz
linux-3.10-afe997a183ecc0be72652c7a5ce2152bdf91724e.tar.bz2
linux-3.10-afe997a183ecc0be72652c7a5ce2152bdf91724e.zip
Pull pstorev4 into release branch
Diffstat (limited to 'fs/Makefile')
-rw-r--r--fs/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile
index a7f7cef0c0c..db71a5b21a4 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -121,3 +121,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/