diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 15:50:49 +0200 |
|---|---|---|
| committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 15:50:49 +0200 |
| commit | e286091b2b21d1ff9166609cd19e0df62b56f4bc (patch) | |
| tree | ba7bda5449376d04f32a3414dabc732f7375804d /crypto/pcompress.c | |
| parent | a5dc0ad5e24d2cdb1a46cc19761605e5902f83eb (diff) | |
| parent | 0b4d1afc94f1724db95c365d3e36f1578ac96dbc (diff) | |
| download | linux-crypto-e286091b2b21d1ff9166609cd19e0df62b56f4bc.tar.gz linux-crypto-e286091b2b21d1ff9166609cd19e0df62b56f4bc.zip | |
Merge commit 'linus/master' into HEAD
Conflicts:
MAINTAINERS
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Diffstat (limited to 'crypto/pcompress.c')
| -rw-r--r-- | crypto/pcompress.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/pcompress.c b/crypto/pcompress.c index ca9a4af9..bcadc037 100644 --- a/crypto/pcompress.c +++ b/crypto/pcompress.c @@ -26,6 +26,7 @@ #include <linux/string.h> #include <crypto/compress.h> +#include <crypto/internal/compress.h> #include "internal.h" |