summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2018-03-02 02:31:25 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-03-06 15:20:23 +0300
commit184ecc5ceb379b43b29fc373f497fca88c73ad38 (patch)
treeea2091f74363a780fa425c631c2cc15dd2835946
parent26f7a294e5ecd46856cb9f5b718e995f1ec46779 (diff)
downloadlinux-184ecc5ceb379b43b29fc373f497fca88c73ad38.tar.xz
staging: lustre: allow monolithic builds
Remove restriction the lustre must be built as modules. It now works as a monolithic build. Signed-off-by: NeilBrown <neilb@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lnet/Kconfig2
-rw-r--r--drivers/staging/lustre/lustre/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
index 6bcb53d0c6f4..ad049e6f24e4 100644
--- a/drivers/staging/lustre/lnet/Kconfig
+++ b/drivers/staging/lustre/lnet/Kconfig
@@ -1,6 +1,6 @@
config LNET
tristate "Lustre networking subsystem (LNet)"
- depends on INET && m
+ depends on INET
help
The Lustre network layer, also known as LNet, is a networking abstaction
level API that was initially created to allow Lustre Filesystem to utilize
diff --git a/drivers/staging/lustre/lustre/Kconfig b/drivers/staging/lustre/lustre/Kconfig
index 90d826946c6a..c669c8fa0cc6 100644
--- a/drivers/staging/lustre/lustre/Kconfig
+++ b/drivers/staging/lustre/lustre/Kconfig
@@ -1,6 +1,6 @@
config LUSTRE_FS
tristate "Lustre file system client support"
- depends on m && !MIPS && !XTENSA && !SUPERH
+ depends on !MIPS && !XTENSA && !SUPERH
depends on LNET
select CRYPTO
select CRYPTO_CRC32