From f5fdfd5db78e4e1ab254768eaa71fe8b690867e3 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sun, 8 Dec 2013 21:59:46 +0000 Subject: [PATCH] Fix build with 'crypto' and 'zfs' in the same kernel. This was the path of least pain I could find. --- sys/conf/files | 2 +- sys/opencrypto/{deflate.c => cryptodeflate.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sys/opencrypto/{deflate.c => cryptodeflate.c} (100%) diff --git a/sys/conf/files b/sys/conf/files index 67a65d2d78f..4765c3bce97 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3728,7 +3728,7 @@ opencrypto/crypto.c optional crypto opencrypto/cryptodev.c optional cryptodev opencrypto/cryptodev_if.m optional crypto opencrypto/cryptosoft.c optional crypto -opencrypto/deflate.c optional crypto +opencrypto/cryptodeflate.c optional crypto opencrypto/rmd160.c optional crypto | ipsec opencrypto/skipjack.c optional crypto opencrypto/xform.c optional crypto diff --git a/sys/opencrypto/deflate.c b/sys/opencrypto/cryptodeflate.c similarity index 100% rename from sys/opencrypto/deflate.c rename to sys/opencrypto/cryptodeflate.c