summaryrefslogtreecommitdiff
path: root/fs/Kconfig
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/Kconfig
parent1a2a76c2685a29e46d7b37e752ccea7b15aa8e24 (diff)
parent0fd169576648452725fa2949bf391d10883d3991 (diff)
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/Kconfig')
-rw-r--r--fs/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 7b623e9fc1b0..8493a3f0c4b1 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -264,6 +264,7 @@ source "fs/pstore/Kconfig"
source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/erofs/Kconfig"
+source "fs/vboxsf/Kconfig"
endif # MISC_FILESYSTEMS