diff options
| author | Tom Rini <trini@konsulko.com> | 2024-07-05 16:36:43 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-07-05 16:36:43 -0600 |
| commit | fd46ea0e701920eb205c2bce9d527bf0dec10b59 (patch) | |
| tree | 7fde587608497f2b1956713e8312c39d98a26b02 /lib/zlib/zutil.c | |
| parent | 18908395edcee8450d742c670610557751866393 (diff) | |
| parent | 7d22317a18e3ace2311c741bea74efa72299e57a (diff) | |
Merge branch '2024-07-05-assorted-updates'
- Re-instate the zlib update, so we can fix it for this release,
assorted whitespace cleanups, allow mkimage to 'auto-conf' signing of
scripts, enhance ELF image support, add more HW rev support to e1000
driver, update am64x_evm config, correct mpc8xxx watchdog, update
phycore-am6 docs.
Diffstat (limited to 'lib/zlib/zutil.c')
| -rw-r--r-- | lib/zlib/zutil.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/zlib/zutil.c b/lib/zlib/zutil.c index 609aac55ce1..ec21b458fcc 100644 --- a/lib/zlib/zutil.c +++ b/lib/zlib/zutil.c @@ -21,7 +21,6 @@ const char * const z_errmsg[10] = { "data error", /* Z_DATA_ERROR (-3) */ "insufficient memory", /* Z_MEM_ERROR (-4) */ "buffer error", /* Z_BUF_ERROR (-5) */ -"incompatible version",/* Z_VERSION_ERROR (-6) */ ""}; #ifdef DEBUG |