Remove old Linux kernel MPPE stuff

[ppp.git] / linux / mppe / linux-2.2.20-make.patch

diff --git a/linux/mppe/linux-2.2.20-make.patch b/linux/mppe/linux-2.2.20-make.patch
deleted file mode 100644 (file)
index d925004..0000000
--- a/linux/mppe/linux-2.2.20-make.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- linux/drivers/net/Makefile.orig    Mon Mar 25 11:38:09 2002
-+++ linux/drivers/net/Makefile Mon Mar 25 11:42:18 2002
-@@ -26,6 +26,8 @@
- CONFIG_BSDCOMP_MODULE  :=
- CONFIG_PPPDEF_BUILTIN :=
- CONFIG_PPPDEF_MODULE  :=
-+CONFIG_PPPMPPE_BUILTIN :=
-+CONFIG_PPPMPPE_MODULE  :=
- CONFIG_7990_BUILTIN :=
- CONFIG_7990_MODULE :=
- CONFIG_82596_BUILTIN :=
-@@ -40,6 +42,7 @@
-     CONFIG_BSDCOMP_BUILTIN = y
-     CONFIG_SLHC_BUILTIN = y
-     CONFIG_PPPDEF_BUILTIN = y
-+    CONFIG_PPPMPPE_BUILTIN = y
-   endif
- else
-   ifeq ($(CONFIG_ISDN),m)
-@@ -47,6 +50,7 @@
-       CONFIG_BSDCOMP_MODULE = y
-       CONFIG_SLHC_MODULE = y
-       CONFIG_PPPDEF_MODULE = y
-+      CONFIG_PPPMPPE_MODULE = y
-     endif
-   endif
- endif
-@@ -325,11 +329,13 @@
- CONFIG_BSDCOMP_BUILTIN = y
- CONFIG_SLHC_BUILTIN = y
- CONFIG_PPPDEF_BUILTIN = y
-+CONFIG_PPPMPPE_BUILTIN = y
- else
-   ifeq ($(CONFIG_PPP),m)
-   CONFIG_BSDCOMP_MODULE = y
-   CONFIG_SLHC_MODULE = y
-   CONFIG_PPPDEF_MODULE = y
-+  CONFIG_PPPMPPE_MODULE = y
-   MX_OBJS += ppp.o
-   endif
- endif
-@@ -1120,6 +1126,17 @@
-   endif
- endif
- 
-+# If anything built-in uses ppp_mppe, then build it into the kernel also.
-+# If not, but a module uses it, build as a module.
-+ifdef CONFIG_PPPMPPE_BUILTIN
-+L_OBJS += ppp_mppe_compress.o arcfour.o sha1.o
-+else
-+  ifdef CONFIG_PPPMPPE_MODULE
-+  PPPMPPE_OBJS = ppp_mppe_compress.o arcfour.o sha1.o
-+  M_OBJS += ppp_mppe.o
-+  endif
-+endif
-+
- ifeq ($(CONFIG_ARIADNE2),y)
- L_OBJS += ariadne2.o
- CONFIG_8390_BUILTIN = y
-@@ -1469,3 +1486,6 @@
- 
- rcpci.o: rcpci45.o rclanmtl.o
-       $(LD) -r -o rcpci.o rcpci45.o rclanmtl.o
-+
-+ppp_mppe.o: $(PPPMPPE_OBJS)
-+      $(LD) -r -o $@ $(PPPMPPE_OBJS)