Commit:     ed407717852895e04f9e088e09a4f27bb56712b7
Parent:     686106ff5ed2cbcd3fc12a22e53c880cf0943eff
Author:     Randy Dunlap <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 9 13:58:42 2006 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Dec 11 14:34:34 2006 -0800

    [NET]: Fix WAN routers kconfig dependency.
    Currently WAN router drivers can be built in-kernel while the
    register/unregister_wan_device interfaces are built as modules.
    This causes:
    drivers/built-in.o: In function `cycx_init':
    cycx_main.c:(.init.text+0x5c4b): undefined reference to 
    drivers/built-in.o: In function `cycx_exit':
    cycx_main.c:(.exit.text+0x560): undefined reference to 
    make: *** [.tmp_vmlinux1] Error 1
    The problem is caused by tristate -> bool conversion (y or m => y),
    so convert WAN_ROUTER_DRIVERS to a tristate so that the correct
    dependency is preserved.
    Signed-off-by: Randy Dunlap <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
 drivers/net/wan/Kconfig |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index d5ab9cf..21f76f5 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -382,7 +382,7 @@ config SDLA
 # Wan router core.
-       bool "WAN router drivers"
+       tristate "WAN router drivers"
        depends on WAN && WAN_ROUTER
          Connect LAN to WAN via Linux box.
@@ -393,7 +393,8 @@ config WAN_ROUTER_DRIVERS
          Note that the answer to this question won't directly affect the
-         kernel: saying N will just cause the configurator to skip all
+         kernel except for how subordinate drivers may be built:
+         saying N will just cause the configurator to skip all
          the questions about WAN router drivers.
          If unsure, say N.
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to