Trond Myklebust a00ed25cce 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>

2011-07-31 14:27:04 -10:00

..

acpi

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

asm-generic

Merge branch 'next/cross-platform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

2011-07-26 17:12:10 -07:00

crypto

net: remove mm.h inclusion from netdevice.h

2011-06-21 19:17:20 -07:00

drm

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

keys

encrypted-keys: add key format support

2011-06-27 09:10:45 -04:00

linux

NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 || !CONFIG_NFS_V4_1

2011-07-31 14:27:04 -10:00

math-emu

…

media

[media] V4L: initial driver for ov5642 CMOS sensor

2011-07-27 17:56:09 -03:00

mtd

UBI: fix minor stylistic issues

2011-04-14 11:34:41 +03:00

net

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

pcmcia

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

2011-07-31 06:23:08 -10:00

rdma

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

rxrpc

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

scsi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

2011-07-30 08:36:02 -10:00

sound

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2011-07-30 00:08:53 -07:00

target

target: Bump version to v4.1.0-rc1-ml

2011-07-22 09:37:49 +00:00

trace

Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

2011-07-29 23:33:40 -07:00

video

Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

2011-05-24 15:49:57 +09:00

xen

xen/balloon: memory hotplug support for Xen balloon driver

2011-07-25 20:57:08 -07:00

Kbuild

…