diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-31 22:39:04 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-01 02:27:04 +0200 |
commit | a00ed25cce6fe856388f89c7cd40da0eee7666a6 (patch) | |
tree | 24f7bfe891bfd40ed1f0013242c757c4be58b47e /arch/m68k/math-emu/fp_log.c | |
parent | Merge branch 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
download | linux-a00ed25cce6fe856388f89c7cd40da0eee7666a6.tar.xz linux-a00ed25cce6fe856388f89c7cd40da0eee7666a6.zip |
NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 || !CONFIG_NFS_V4_1
Fix two recently introduced compile problems:
Fix a typo in fs/nfs/pnfs.h
Move the pnfs_blksize declaration outside the CONFIG_NFS_V4 section in
struct nfs_server.
Reported-by: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/math-emu/fp_log.c')
0 files changed, 0 insertions, 0 deletions