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>

diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
index 6bcb53d0c6f4a8ddd3285873fc02990775a8d415..ad049e6f24e47a73b6894340be2742d95b21f692 100644 (file)
--- 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 90d826946c6a554c6f481be79a9a7e72a08ba7e1..c669c8fa0cc614686b91de6d251e2f0162ead625 100644 (file)
--- 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