Merge branches 'release' and 'wmi-2.6.25' into release

[sfrench/cifs-2.6.git] / crypto / compress.c

diff --git a/crypto/compress.c b/crypto/compress.c
index 0a6570048c1efb6ffaf6199662e4e33ee7ae9010..1ee357085d3a40bfdd8e3013e7fc7b501eb32948 100644 (file)
--- a/crypto/compress.c
+++ b/crypto/compress.c
@@ -14,7 +14,6 @@
 #include <linux/types.h>
 #include <linux/crypto.h>
 #include <linux/errno.h>
-#include <asm/scatterlist.h>
 #include <linux/string.h>
 #include "internal.h"