summaryrefslogtreecommitdiffstats
path: root/drivers/net/pppox.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-07-09 10:28:38 +0200
committerRusty Russell <rusty@rustcorp.com.au>2008-10-17 02:38:35 +1100
commita65e5d782f9db2a61a914dc01a329e0c2dcf92a1 (patch)
tree2143455a8bbcb49bbcef746e45f06e497f2eadfb /drivers/net/pppox.c
parent04ab591808565f968d4406f6435090ad671ebdab (diff)
downloadlinux-a65e5d782f9db2a61a914dc01a329e0c2dcf92a1.tar.bz2
remove CONFIG_KMOD from drivers
Straight forward conversions to CONFIG_MODULE; many drivers include <linux/kmod.h> conditionally and then don't have any other conditional code so remove it from those. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Cc: video4linux-list@redhat.com Cc: David Woodhouse <dwmw2@infradead.org> Cc: linux-ppp@vger.kernel.org Cc: dm-devel@redhat.com Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/net/pppox.c')
-rw-r--r--drivers/net/pppox.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c
index c6898c1fc54d..03aecc97fb45 100644
--- a/drivers/net/pppox.c
+++ b/drivers/net/pppox.c
@@ -115,13 +115,8 @@ static int pppox_create(struct net *net, struct socket *sock, int protocol)
goto out;
rc = -EPROTONOSUPPORT;
-#ifdef CONFIG_KMOD
- if (!pppox_protos[protocol]) {
- char buffer[32];
- sprintf(buffer, "pppox-proto-%d", protocol);
- request_module(buffer);
- }
-#endif
+ if (!pppox_protos[protocol])
+ request_module("pppox-proto-%d", protocol);
if (!pppox_protos[protocol] ||
!try_module_get(pppox_protos[protocol]->owner))
goto out;