Merge branch 'hid-suspend' into picolcd

[sfrench/cifs-2.6.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index c3633aa46911556ce8dd56e621bfacdc916769a2..97f340f14ba2d7a181e0788a404ed3698a382ed9 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -125,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS)              += ocfs2/
 obj-$(CONFIG_BTRFS_FS)         += btrfs/
 obj-$(CONFIG_GFS2_FS)           += gfs2/
 obj-$(CONFIG_EXOFS_FS)          += exofs/
+obj-$(CONFIG_CEPH_FS)          += ceph/