diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2006-12-09 16:58:42 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-11 17:34:34 -0500 |
commit | ed407717852895e04f9e088e09a4f27bb56712b7 (patch) | |
tree | 9d20ed5c9fa9119b3e856b4519a40cc6f9d7e3b5 /drivers | |
parent | 686106ff5ed2cbcd3fc12a22e53c880cf0943eff (diff) |
[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: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | 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 d5ab9cf13257..21f76f51c95e 100644 --- a/drivers/net/wan/Kconfig +++ b/drivers/net/wan/Kconfig | |||
@@ -382,7 +382,7 @@ config SDLA | |||
382 | 382 | ||
383 | # Wan router core. | 383 | # Wan router core. |
384 | config WAN_ROUTER_DRIVERS | 384 | config WAN_ROUTER_DRIVERS |
385 | bool "WAN router drivers" | 385 | tristate "WAN router drivers" |
386 | depends on WAN && WAN_ROUTER | 386 | depends on WAN && WAN_ROUTER |
387 | ---help--- | 387 | ---help--- |
388 | Connect LAN to WAN via Linux box. | 388 | Connect LAN to WAN via Linux box. |
@@ -393,7 +393,8 @@ config WAN_ROUTER_DRIVERS | |||
393 | <file:Documentation/networking/wan-router.txt>. | 393 | <file:Documentation/networking/wan-router.txt>. |
394 | 394 | ||
395 | Note that the answer to this question won't directly affect the | 395 | Note that the answer to this question won't directly affect the |
396 | kernel: saying N will just cause the configurator to skip all | 396 | kernel except for how subordinate drivers may be built: |
397 | saying N will just cause the configurator to skip all | ||
397 | the questions about WAN router drivers. | 398 | the questions about WAN router drivers. |
398 | 399 | ||
399 | If unsure, say N. | 400 | If unsure, say N. |