X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=crypto%2Fscatterwalk.c;h=297e19d13c4e6c34dd52688158266a1b502be518;hb=b2ab4a57b018aafbba35bff088218f5cc3d2142e;hp=b9bbda0bb9f968efc4a728dd316952b7516f617b;hpb=69450bb5eb8e9df28281c62f98e971c9969dc4ff;p=powerpc.git

diff --git a/crypto/scatterwalk.c b/crypto/scatterwalk.c
index b9bbda0bb9..297e19d13c 100644
--- a/crypto/scatterwalk.c
+++ b/crypto/scatterwalk.c
@@ -13,6 +13,8 @@
  * any later version.
  *
  */
+
+#include <crypto/scatterwalk.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/module.h>
@@ -20,9 +22,6 @@
 #include <linux/highmem.h>
 #include <linux/scatterlist.h>
 
-#include "internal.h"
-#include "scatterwalk.h"
-
 static inline void memcpy_dir(void *buf, void *sgdata, size_t nbytes, int out)
 {
 	void *src = out ? buf : sgdata;
@@ -113,7 +112,7 @@ void scatterwalk_map_and_copy(void *buf, struct scatterlist *sg,
 			break;
 
 		offset += sg->length;
-		sg = sg_next(sg);
+		sg = scatterwalk_sg_next(sg);
 	}
 
 	scatterwalk_advance(&walk, start - offset);