Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index d2c3353..680ad8a 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -123,3 +123,4 @@ obj-$(CONFIG_GFS2_FS)           += gfs2/
 obj-y                          += exofs/ # Multiple modules
 obj-$(CONFIG_CEPH_FS)          += ceph/
 obj-$(CONFIG_PSTORE)           += pstore/
+obj-$(CONFIG_AUFS_FS)           += aufs/