staging: lustre: make lustre dependent on LNet

In the case of lustre routers you only need a functioning
LNet stack. Especially since often the routers are very
light weight and want to avoid any addition software that
would create additional pressures on the system.

Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 8242923371ad9aef2c254aad2332dca595919a60..c008cfc7f4b1236b91fb8dab9d8557b4a6a74633 100644 (file)
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -30,7 +30,7 @@ obj-$(CONFIG_WIMAX_GDM72XX)   += gdm72xx/
 obj-$(CONFIG_LTE_GDM724X)      += gdm724x/
 obj-$(CONFIG_FIREWIRE_SERIAL)  += fwserial/
 obj-$(CONFIG_GOLDFISH)         += goldfish/
-obj-$(CONFIG_LUSTRE_FS)                += lustre/
+obj-$(CONFIG_LNET)             += lustre/
 obj-$(CONFIG_DGNC)                     += dgnc/
 obj-$(CONFIG_MTD_SPINAND_MT29F)        += mt29f_spinand/
 obj-$(CONFIG_GS_FPGABOOT)      += gs_fpgaboot/

diff --git a/drivers/staging/lustre/Kconfig b/drivers/staging/lustre/Kconfig
index a224d88bf43d36d5a4fdd431d9d11ba1d36b4951..b7d81096eee9e87a533abbf42e1ecaab66b91190 100644 (file)
--- a/drivers/staging/lustre/Kconfig
+++ b/drivers/staging/lustre/Kconfig
@@ -1,3 +1,3 @@
-source "drivers/staging/lustre/lustre/Kconfig"
-
 source "drivers/staging/lustre/lnet/Kconfig"
+
+source "drivers/staging/lustre/lustre/Kconfig"

diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
index 980ce444ac81a281c8c693a7d5efed59d8c9cee9..2b5930150cdafeda14fde7e620b437ca6415a101 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 LUSTRE_FS
+       depends on INET && m
        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 62c7bba7527481fdf99534d6fa8a9a2123deea32..a09b51ce8265820615439f33844890a580dab6cf 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 INET && m && !MIPS && !XTENSA && !SUPERH
+       depends on m && !MIPS && !XTENSA && !SUPERH
        select LNET
        select CRYPTO
        select CRYPTO_CRC32