1
0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00

Revert r293070

It seems that `options GZIP` and `options ZFS` collide because they both
define inconsistent definitions for inflate, etc

Fixing this will require upgrading zlib in the kernel, as suggested in
r245102.

Pointyhat to: ngie
Reported by: bz
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2016-01-03 08:48:23 +00:00
parent 86e3671a7e
commit 7c309ad0c1
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=293091

View File

@ -3012,6 +3012,3 @@ options EM_MULTIQUEUE # Activate multiqueue features/disable MSI-X
# zlib I/O stream support
# This enables support for compressed core dumps.
options GZIO
# ZFS (Zeta File System) support
options ZFS