diff options
| author |   Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 12:43:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 12:43:21 -0700 |
| commit | 160acc2e899f26356bde92bc257253b7ca78f0c3 (patch) | |
| tree | c60782685ac0fdf4b2d6278c4be639181dd65126 /fs | |
| parent | Merge branch 'v2.6.24-rc1-lockdep' of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep (diff) | |
| parent | [SG] Get rid of __sg_mark_end() (diff) | |
| download | linux-dev-160acc2e899f26356bde92bc257253b7ca78f0c3.tar.xz linux-dev-160acc2e899f26356bde92bc257253b7ca78f0c3.zip | |
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.c | 2 |
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> |