From 26b20ea3115bc2d2e48d7bd652bc38f8cd367db6 Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 28 Dec 2013 01:03:30 +0000 Subject: [PATCH] MFC r259109: allow ZFS to co-habitate with crypto / aesni git-svn-id: svn://svn.freebsd.org/base/stable/10@259980 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- 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 27d9c7eb7..80ce9ca27 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3711,7 +3711,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 -- 2.45.0