[-mm patch] fix the DLM dependencies.

[Adrian Bunk <bunk@stusta.de>]

On Tue, Nov 14, 2006 at 01:41:25AM -0800, Andrew Morton wrote:
>...
> - A nasty Kconfig warning comes out during the build.  It's due to
>   git-gfs2-nmw.patch.
>...

So let's fix it.  ;-)

cu
Adrian


<--  snip  -->


Kconfig said:
Warning! Found recursive dependency: INET IPV6 DLM (null) DLM_TCP INET

Due to the "depends on IPV6 || IPV6=n" it's not really a circular 
dependency, but there's another bug that anyway should be fixed:
The "select IP_SCTP" ignored the dependency of IP_SCTP on INET.

Considering that:
- there's no way to use DLM with INET=n and
- INET=n being a mostly pathological case
this patch fixes both this bug and the "recursive dependency" warning by 
letting DLM depend on INET again.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.19-rc5-mm2/fs/dlm/Kconfig.old	2006-11-14 18:41:35.000000000 +0100
+++ linux-2.6.19-rc5-mm2/fs/dlm/Kconfig	2006-11-14 18:44:12.000000000 +0100
@@ -1,5 +1,5 @@
 menu "Distributed Lock Manager"
-	depends on EXPERIMENTAL
+	depends on EXPERIMENTAL && INET
 
 config DLM
 	tristate "Distributed Lock Manager (DLM)"
@@ -20,7 +20,6 @@ choice
 
 config DLM_TCP
 	bool "TCP/IP"
-	select INET
 
 config DLM_SCTP
 	bool "SCTP"

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/