]> err.no Git - linux-2.6/commitdiff
[NET]: Fix WAN routers kconfig dependency.
authorRandy Dunlap <randy.dunlap@oracle.com>
Sat, 9 Dec 2006 21:58:42 +0000 (13:58 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 11 Dec 2006 22:34:34 +0000 (14:34 -0800)
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 `register_wan_device'
drivers/built-in.o: In function `cycx_exit':
cycx_main.c:(.exit.text+0x560): undefined reference to `unregister_wan_device'
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 <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/wan/Kconfig

index d5ab9cf13257145eb3e43d6f508850f6228f87e6..21f76f51c95e4efd26c4466330e74a63d322f42d 100644 (file)
@@ -382,7 +382,7 @@ config SDLA
 
 # Wan router core.
 config WAN_ROUTER_DRIVERS
-       bool "WAN router drivers"
+       tristate "WAN router drivers"
        depends on WAN && WAN_ROUTER
        ---help---
          Connect LAN to WAN via Linux box.
@@ -393,7 +393,8 @@ config WAN_ROUTER_DRIVERS
          <file:Documentation/networking/wan-router.txt>.
 
          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.