patch-2.1.90 linux/drivers/net/ppp.c

Next file: linux/drivers/net/seeq8005.c
Previous file: linux/drivers/net/ipddp.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.89/linux/drivers/net/ppp.c linux/drivers/net/ppp.c
@@ -3,6 +3,7 @@
  *  Michael Callahan <callahan@maths.ox.ac.uk>
  *  Al Longyear <longyear@netcom.com>
  *  Paul Mackerras <Paul.Mackerras@cs.anu.edu.au>
+ *  Cyrus Durgin <cider@speakeasy.org> (changes for kmod)
  *
  *  Dynamic PPP devices by Jim Freeman <jfree@caldera.com>.
  *  ppp_tty_receive ``noisy-raise-bug'' fixed by Ove Ewerlid <ewerlid@syscon.uu.se>
@@ -50,7 +51,7 @@
 
 /* $Id: ppp.c,v 1.14 1997/11/27 06:04:45 paulus Exp $ */
 
-#include <linux/config.h> /* for CONFIG_KERNELD */
+#include <linux/config.h> /* for CONFIG_KMOD */
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -94,8 +95,8 @@
 #include <linux/if_pppvar.h>
 #include <linux/ppp-comp.h>
 
-#ifdef CONFIG_KERNELD
-#include <linux/kerneld.h>
+#ifdef CONFIG_KMOD
+#include <linux/kmod.h>
 #endif
 
 #ifndef PPP_IPX
@@ -2190,14 +2191,14 @@
 	restore_flags(flags);
 
 	cp = find_compressor (ccp_option[0]);
-#ifdef CONFIG_KERNELD
+#ifdef CONFIG_KMOD
 	if (cp == NULL) {
 		char modname[32];
 		sprintf(modname, "ppp-compress-%d", ccp_option[0]);
 		request_module(modname);
 		cp = find_compressor(ccp_option[0]);
 	}
-#endif /* CONFIG_KERNELD */
+#endif /* CONFIG_KMOD */
 
 	if (cp == NULL)
 		goto out_no_comp;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov