From 9752f90bc23d8ee78ee9d8613b89436e4fc505af Mon Sep 17 00:00:00 2001 From: Guenter Roeck <groeck@chromium.org> Date: Tue, 1 Mar 2016 09:47:32 -0800 Subject: [PATCH] net: ppp: Fix modular build for PPPOLAC and PPPOPNS Unlike other configurations in net/ppp, PPPOLAC and PPPOPNS are defined as boolean configuration options. In allmodconfig builds (or, specifically, if PPP and some of the other PPP protocols were built as modules), this resulted in build errors such as the following, since pppox was built both as module and into the kernel. ERROR: "pppox_ioctl" [net/l2tp/l2tp_ppp.ko] undefined! ERROR: "unregister_pppox_proto" [net/l2tp/l2tp_ppp.ko] undefined! ERROR: "register_pppox_proto" [net/l2tp/l2tp_ppp.ko] undefined! ERROR: "pppox_unbind_sock" [net/l2tp/l2tp_ppp.ko] undefined! Fix the problem by defining PPPOLAC and PPPOPNS tristate. Signed-off-by: Guenter Roeck <groeck@chromium.org> --- drivers/net/ppp/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ppp/Kconfig b/drivers/net/ppp/Kconfig index e4cf44b1e815..282aec4860eb 100644 --- a/drivers/net/ppp/Kconfig +++ b/drivers/net/ppp/Kconfig @@ -150,7 +150,7 @@ config PPPOL2TP if TTY config PPPOLAC - bool "PPP on L2TP Access Concentrator" + tristate "PPP on L2TP Access Concentrator" depends on PPP && INET help L2TP (RFC 2661) is a tunneling protocol widely used in virtual private @@ -159,7 +159,7 @@ config PPPOLAC fairly simple and suited for clients. config PPPOPNS - bool "PPP on PPTP Network Server" + tristate "PPP on PPTP Network Server" depends on PPP && INET help PPTP (RFC 2637) is a tunneling protocol widely used in virtual private -- 2.34.1