diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-07-15 10:24:53 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-07-15 10:24:53 +0200 |
| commit | e8b9dd7e2471b1274e3be719fcc385e0a710e46f (patch) | |
| tree | 030d7ce20e8f8767d9423f78c102aba089eec372 /fs/nfs/nfs4_fs.h | |
| parent | 924412f66fd9d21212e560a93792b0b607d46c6e (diff) | |
| parent | 6b1859dba01c7d512b72d77e3fd7da8354235189 (diff) | |
| download | linux-e8b9dd7e2471b1274e3be719fcc385e0a710e46f.tar.bz2 | |
Merge branch 'timers/urgent' into timers/core
Reason: Update to upstream changes to avoid further conflicts.
Fixup a trivial merge conflict in kernel/time/tick-sched.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/nfs/nfs4_fs.h')
| -rw-r--r-- | fs/nfs/nfs4_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index c6827f93ab57..cc5900ac61b5 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -295,7 +295,7 @@ is_ds_client(struct nfs_client *clp) extern const struct nfs4_minor_version_ops *nfs_v4_minor_ops[]; -extern const u32 nfs4_fattr_bitmap[2]; +extern const u32 nfs4_fattr_bitmap[3]; extern const u32 nfs4_statfs_bitmap[2]; extern const u32 nfs4_pathconf_bitmap[2]; extern const u32 nfs4_fsinfo_bitmap[3]; |