summaryrefslogtreecommitdiffstats
path: root/sys/modules/if_ppp
diff options
context:
space:
mode:
authorwkoszek <wkoszek@FreeBSD.org>2006-02-27 16:56:22 +0000
committerwkoszek <wkoszek@FreeBSD.org>2006-02-27 16:56:22 +0000
commit296928cec1bbec980dbc12f6b56a3419651cc819 (patch)
tree90c53c0ea97b80896810305acd80ed5c26b81d77 /sys/modules/if_ppp
parent3ad16c4a5f6685c188056cbd45faf762e1e6819e (diff)
downloadFreeBSD-src-296928cec1bbec980dbc12f6b56a3419651cc819.zip
FreeBSD-src-296928cec1bbec980dbc12f6b56a3419651cc819.tar.gz
This patch fixes a problem, which exists if you have IPSEC in your kernel
and want to have crypto support loaded as KLD. By moving zlib to separate module and adding MODULE_DEPEND directives, it is possible to use such configuration without complication. Otherwise, since IPSEC is linked with zlib (just like crypto.ko) you'll get following error: interface zlib.1 already present in the KLD 'kernel'! Approved by: cognet (mentor)
Diffstat (limited to 'sys/modules/if_ppp')
-rw-r--r--sys/modules/if_ppp/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index eef495f..1be2e02 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -16,7 +16,7 @@ PPP_IPX?= 0 # 0/1 - requires IPX to be configured in kernel
SRCS+= bsd_comp.c
.endif
.if ${PPP_DEFLATE} > 0
-SRCS+= ppp_deflate.c zlib.c
+SRCS+= ppp_deflate.c
.endif
.if !defined(KERNBUILDDIR)
OpenPOWER on IntegriCloud