diff options
author | Chris Zankel <chris@zankel.net> | 2014-11-10 00:05:43 -0800 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2014-11-10 00:05:43 -0800 |
commit | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (patch) | |
tree | ea1ee0a54d4c24221a1e80cd07e899f8b34a6920 /fs/Makefile | |
parent | 66acb0216d5ae1f29fe76c5a192547664c5c0159 (diff) | |
parent | 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (diff) |
Merge tag 'v3.18-rc4' into for_next
Linux 3.18-rc4
Diffstat (limited to 'fs/Makefile')
-rw-r--r-- | fs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index 90c88529892..34a1b9dea6d 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -104,6 +104,7 @@ obj-$(CONFIG_QNX6FS_FS) += qnx6/ obj-$(CONFIG_AUTOFS4_FS) += autofs4/ obj-$(CONFIG_ADFS_FS) += adfs/ obj-$(CONFIG_FUSE_FS) += fuse/ +obj-$(CONFIG_OVERLAYFS_FS) += overlayfs/ obj-$(CONFIG_UDF_FS) += udf/ obj-$(CONFIG_SUN_OPENPROMFS) += openpromfs/ obj-$(CONFIG_OMFS_FS) += omfs/ |