Linux-kernel mailing list archive 1997-48,: super-minor 2.1.69 patch for ppp_deflate

# super-minor 2.1.69 patch for ppp_deflate

Nicholas J. Leon (nicholas@binary9.net)
Tue, 2 Dec 1997 21:27:53 -0500 (EST)

- Messages sorted by: [ date ][ thread ][ subject ][ author ]
- Next message: linux kernel account: "Re: Linux 2.1.69.."
- Previous message: Michael Harnois: "Re: [2.1.69] Patch for ppp-2.2.0f"

ppp_deflate is apparently included in the newest kernels, however the
Makefile doesn't include any support for it ... so ...

I didn't know exactly how to include it, so I follow SLHC's pattern.

--- linux.69.stock/drivers/net/Makefile Tue Dec 2 19:43:54 1997
+++ linux/drivers/net/Makefile Tue Dec 2 19:55:32 1997
@@ -22,17 +22,21 @@
CONFIG_8390_MODULE :=
CONFIG_SLHC_BUILTIN :=
CONFIG_SLHC_MODULE :=
+CONFIG_PPPDEF_BUILTIN :=
+CONFIG_PPPDEF_MODULE :=
CONFIG_HDLCDRV_BUILTIN :=
CONFIG_HDLCDRV_MODULE :=
ifeq ($(CONFIG_ISDN),y)
ifeq ($(CONFIG_ISDN_PPP),y)
CONFIG_SLHC_BUILTIN = y
+ CONFIG_PPPDEF_BUILTIN = y
endif
else
ifeq ($(CONFIG_ISDN),m)
ifeq ($(CONFIG_ISDN_PPP),y)
CONFIG_SLHC_MODULE = y
+ CONFIG_PPPDEF_BUILTIN = y
endif
endif
endif
@@ -186,26 +190,30 @@
ifeq ($(CONFIG_PPP),y)
LX_OBJS += ppp.o
CONFIG_SLHC_BUILTIN = y
+CONFIG_PPPDEF_BUILTIN = y
else
ifeq ($(CONFIG_PPP),m)
CONFIG_SLHC_MODULE = y
+ CONFIG_PPPDEF_MODULE = y
MX_OBJS += ppp.o
endif
endif
ifdef CONFIG_PPP
- M_OBJS += bsd_comp.o
+ M_OBJS += bsd_comp.o
endif
ifeq ($(CONFIG_SLIP),y)
L_OBJS += slip.o
ifeq ($(CONFIG_SLIP_COMPRESSED),y)
CONFIG_SLHC_BUILTIN = y
+ CONFIG_PPPDEF_BUILTIN = y
endif
else
ifeq ($(CONFIG_SLIP),m)
ifeq ($(CONFIG_SLIP_COMPRESSED),y)
CONFIG_SLHC_MODULE = y
+ CONFIG_PPPDEF_MODULE = y
endif
M_OBJS += slip.o
endif
@@ -596,6 +604,15 @@
endif
endif
+# if anything built-in uses ppp_deflate, then build it into the kernel also.
+# If not, but a module uses it, build as a module:
+ifdef CONFIG_PPPDEF_BUILTIN
+LX_OBJS += ppp_deflate.o
+else
+ ifdef CONFIG_PPPDEF_MODULE
+ MX_OBJS += ppp_deflate.o
+ endif
+endif
# If anything built-in uses the 8390, then build it into the kernel also.
# If not, but a module uses it, build as a module.

___________________________________________________________________________

simple is elegant nicholas@binary9.net
___________________________________________________________________________

- Next message: linux kernel account: "Re: Linux 2.1.69.."
- Previous message: Michael Harnois: "Re: [2.1.69] Patch for ppp-2.2.0f"