summaryrefslogtreecommitdiffstats
path: root/fs/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-09 12:41:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-09 12:41:00 -0800
commit5586c3c1e0eb04cb8b16684aef779e019c8cc64e (patch)
tree0d078e7c8b0be264016e6fa1ed49e68f17e754bb /fs/Makefile
parent1a2a76c2685a29e46d7b37e752ccea7b15aa8e24 (diff)
parent0fd169576648452725fa2949bf391d10883d3991 (diff)
downloadlinux-stable-5586c3c1e0eb04cb8b16684aef779e019c8cc64e.tar.gz
linux-stable-5586c3c1e0eb04cb8b16684aef779e019c8cc64e.tar.bz2
linux-stable-5586c3c1e0eb04cb8b16684aef779e019c8cc64e.zip
Merge branch 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vboxfs from Al Viro: "This is the VirtualBox guest shared folder support by Hans de Goede, with fixups for fs_parse folded in to avoid bisection hazards from those API changes..." * 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fs: Add VirtualBox guest shared folder (vboxsf) support
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 98be354fdb61..96520ba7bd64 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -133,3 +133,4 @@ obj-$(CONFIG_CEPH_FS) += ceph/
obj-$(CONFIG_PSTORE) += pstore/
obj-$(CONFIG_EFIVAR_FS) += efivarfs/
obj-$(CONFIG_EROFS_FS) += erofs/
+obj-$(CONFIG_VBOXSF_FS) += vboxsf/