From: Mike Halcrow <mhalcrow@us.ibm.com>

Grab the scatterlist header from the right place.

Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/ecryptfs/crypto.c   |    1 -
 fs/ecryptfs/keystore.c |    2 +-
 fs/ecryptfs/mmap.c     |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff -puN fs/ecryptfs/crypto.c~ecryptfs-asm-scatterlisth-linux-scatterlisth fs/ecryptfs/crypto.c
--- a/fs/ecryptfs/crypto.c~ecryptfs-asm-scatterlisth-linux-scatterlisth
+++ a/fs/ecryptfs/crypto.c
@@ -33,7 +33,6 @@
 #include <linux/crypto.h>
 #include <linux/file.h>
 #include <linux/scatterlist.h>
-#include <asm/scatterlist.h>
 #include "ecryptfs_kernel.h"
 
 static int
diff -puN fs/ecryptfs/keystore.c~ecryptfs-asm-scatterlisth-linux-scatterlisth fs/ecryptfs/keystore.c
--- a/fs/ecryptfs/keystore.c~ecryptfs-asm-scatterlisth-linux-scatterlisth
+++ a/fs/ecryptfs/keystore.c
@@ -31,7 +31,7 @@
 #include <linux/key.h>
 #include <linux/random.h>
 #include <linux/crypto.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 #include "ecryptfs_kernel.h"
 
 /**
diff -puN fs/ecryptfs/mmap.c~ecryptfs-asm-scatterlisth-linux-scatterlisth fs/ecryptfs/mmap.c
--- a/fs/ecryptfs/mmap.c~ecryptfs-asm-scatterlisth-linux-scatterlisth
+++ a/fs/ecryptfs/mmap.c
@@ -31,7 +31,7 @@
 #include <linux/mount.h>
 #include <linux/file.h>
 #include <linux/crypto.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 #include "ecryptfs_kernel.h"
 
 struct kmem_cache *ecryptfs_lower_page_cache;
_