summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-03 12:43:21 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-11-03 12:43:21 -0700
commit160acc2e899f26356bde92bc257253b7ca78f0c3 (patch)
treec60782685ac0fdf4b2d6278c4be639181dd65126 /fs
parenta7e1e001f432d5960b929787a2a261cf5a7ddac5 (diff)
parentc46f2334c84c2b26baa64d42d75ddc5fab38c3dc (diff)
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
* 'sg' of git://git.kernel.dk/linux-2.6-block: [SG] Get rid of __sg_mark_end() cleanup asm/scatterlist.h includes SG: Make sg_init_one() use general table init functions
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4recover.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c
index 6f03918018a3..1602cd00dd45 100644
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@@ -43,7 +43,7 @@
#include <linux/file.h>
#include <linux/namei.h>
#include <asm/uaccess.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
#include <linux/crypto.h>
#include <linux/sched.h>