Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm

[deliverable/linux.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index a7f7cef0c0c8343da03006fe39d5cce1a6bd225a..fb68c2b8cf8a73626bc2900048a0d4928993c365 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -48,6 +48,8 @@ obj-$(CONFIG_FS_POSIX_ACL)    += posix_acl.o xattr_acl.o
 obj-$(CONFIG_NFS_COMMON)       += nfs_common/
 obj-$(CONFIG_GENERIC_ACL)      += generic_acl.o
 
+obj-$(CONFIG_FHANDLE)          += fhandle.o
+
 obj-y                          += quota/
 
 obj-$(CONFIG_PROC_FS)          += proc/
@@ -121,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/