diff --git a/[refs] b/[refs] index 5e93fa24b9c4..5d91ab57face 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4965f5667f36a95b41cda6638875bc992bd7d18b +refs/heads/master: 33e2a4227ddff7c18921ac175fae3ab0e3ff8a76 diff --git a/trunk/lib/decompress.c b/trunk/lib/decompress.c index 3d766b7f60ab..31a804277282 100644 --- a/trunk/lib/decompress.c +++ b/trunk/lib/decompress.c @@ -14,6 +14,7 @@ #include #include +#include #ifndef CONFIG_DECOMPRESS_GZIP # define gunzip NULL @@ -31,11 +32,13 @@ # define unlzo NULL #endif -static const struct compress_format { +struct compress_format { unsigned char magic[2]; const char *name; decompress_fn decompressor; -} compressed_formats[] = { +}; + +static const struct compress_format compressed_formats[] __initdata = { { {037, 0213}, "gzip", gunzip }, { {037, 0236}, "gzip", gunzip }, { {0x42, 0x5a}, "bzip2", bunzip2 }, @@ -45,7 +48,7 @@ static const struct compress_format { { {0, 0}, NULL, NULL } }; -decompress_fn decompress_method(const unsigned char *inbuf, int len, +decompress_fn __init decompress_method(const unsigned char *inbuf, int len, const char **name) { const struct compress_format *cf;