Skip to content

Commit

Permalink
[NET]: Fix WAN routers kconfig dependency.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Randy Dunlap authored and David S. Miller committed Dec 11, 2006
1 parent 686106f commit ed40771
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/net/wan/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down

0 comments on commit ed40771

Please sign in to comment.