Merge tag 'pm-5.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

[linux.git] / lib / Kconfig

diff --git a/lib/Kconfig b/lib/Kconfig
index 6e790dc55c5b0cc88001978d96a2ad982989b8da..0cf875fd627c062149c1ec4e34e181d0b34357bf 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -278,6 +278,13 @@ config ZLIB_DEFLATE
        tristate
        select BITREVERSE
 
+config ZLIB_DFLTCC
+       def_bool y
+       depends on S390
+       prompt "Enable s390x DEFLATE CONVERSION CALL support for kernel zlib"
+       help
+        Enable s390x hardware support for zlib in the kernel.
+
 config LZO_COMPRESS
        tristate
 
@@ -566,6 +573,9 @@ config DIMLIB
 config LIBFDT
        bool
 
+config LIBXBC
+       bool
+
 config OID_REGISTRY
        tristate
        help