Commit ed407717 authored by Randy Dunlap's avatar Randy Dunlap Committed by David S. Miller

[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 `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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 686106ff
...@@ -382,7 +382,7 @@ config SDLA ...@@ -382,7 +382,7 @@ config SDLA
# Wan router core. # Wan router core.
config WAN_ROUTER_DRIVERS config WAN_ROUTER_DRIVERS
bool "WAN router drivers" tristate "WAN router drivers"
depends on WAN && WAN_ROUTER depends on WAN && WAN_ROUTER
---help--- ---help---
Connect LAN to WAN via Linux box. Connect LAN to WAN via Linux box.
...@@ -393,7 +393,8 @@ config WAN_ROUTER_DRIVERS ...@@ -393,7 +393,8 @@ config WAN_ROUTER_DRIVERS
<file:Documentation/networking/wan-router.txt>. <file:Documentation/networking/wan-router.txt>.
Note that the answer to this question won't directly affect the 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. the questions about WAN router drivers.
If unsure, say N. If unsure, say N.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment