diff options
| author | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2013-08-28 15:18:13 -0400 |
| commit | 8be137f2664f0abb096626a9d2ce0fcdd955b109 (patch) | |
| tree | 2c53a5535265a58eb397d6fbbab2ec26e92e6931 /lib/lz4/lz4_decompress.c | |
| parent | 8851b9f1625ce0858e9b1bb0ae4a57d4b43178b1 (diff) | |
| parent | d8dfad3876e4386666b759da3c833d62fb8b2267 (diff) | |
Merge tag 'v3.11-rc7' into devicetree/next
Linux 3.11-rc7
Diffstat (limited to 'lib/lz4/lz4_decompress.c')
| -rw-r--r-- | lib/lz4/lz4_decompress.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/lz4/lz4_decompress.c b/lib/lz4/lz4_decompress.c index d3414eae73a1..411be80ddb46 100644 --- a/lib/lz4/lz4_decompress.c +++ b/lib/lz4/lz4_decompress.c | |||
| @@ -299,7 +299,7 @@ exit_0: | |||
| 299 | return ret; | 299 | return ret; |
| 300 | } | 300 | } |
| 301 | #ifndef STATIC | 301 | #ifndef STATIC |
| 302 | EXPORT_SYMBOL_GPL(lz4_decompress); | 302 | EXPORT_SYMBOL(lz4_decompress); |
| 303 | #endif | 303 | #endif |
| 304 | 304 | ||
| 305 | int lz4_decompress_unknownoutputsize(const char *src, size_t src_len, | 305 | int lz4_decompress_unknownoutputsize(const char *src, size_t src_len, |
| @@ -319,8 +319,8 @@ exit_0: | |||
| 319 | return ret; | 319 | return ret; |
| 320 | } | 320 | } |
| 321 | #ifndef STATIC | 321 | #ifndef STATIC |
| 322 | EXPORT_SYMBOL_GPL(lz4_decompress_unknownoutputsize); | 322 | EXPORT_SYMBOL(lz4_decompress_unknownoutputsize); |
| 323 | 323 | ||
| 324 | MODULE_LICENSE("GPL"); | 324 | MODULE_LICENSE("Dual BSD/GPL"); |
| 325 | MODULE_DESCRIPTION("LZ4 Decompressor"); | 325 | MODULE_DESCRIPTION("LZ4 Decompressor"); |
| 326 | #endif | 326 | #endif |