diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
| commit | dba861461f88c12249ac78fb877866c04f99deb3 (patch) | |
| tree | 5812b143581bcc66c7c542f01ba0cb22e489b8e5 /include/linux/nfs4.h | |
| parent | 0e6601eee039893a3f6420596ae4588d90d13cbe (diff) | |
| parent | 228fdc083b017eaf90e578fa86fb1ecfd5ffae87 (diff) | |
Merge branch 'linus' into timers/core
Pick up the latest fixes and refresh the branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/nfs4.h')
| -rw-r--r-- | include/linux/nfs4.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h index c1637062c1ce..12c2cb947df5 100644 --- a/include/linux/nfs4.h +++ b/include/linux/nfs4.h | |||
| @@ -413,16 +413,6 @@ enum lock_type4 { | |||
| 413 | #define NFS4_VERSION 4 | 413 | #define NFS4_VERSION 4 |
| 414 | #define NFS4_MINOR_VERSION 0 | 414 | #define NFS4_MINOR_VERSION 0 |
| 415 | 415 | ||
| 416 | #if defined(CONFIG_NFS_V4_2) | ||
| 417 | #define NFS4_MAX_MINOR_VERSION 2 | ||
| 418 | #else | ||
| 419 | #if defined(CONFIG_NFS_V4_1) | ||
| 420 | #define NFS4_MAX_MINOR_VERSION 1 | ||
| 421 | #else | ||
| 422 | #define NFS4_MAX_MINOR_VERSION 0 | ||
| 423 | #endif /* CONFIG_NFS_V4_1 */ | ||
| 424 | #endif /* CONFIG_NFS_V4_2 */ | ||
| 425 | |||
| 426 | #define NFS4_DEBUG 1 | 416 | #define NFS4_DEBUG 1 |
| 427 | 417 | ||
| 428 | /* Index of predefined Linux client operations */ | 418 | /* Index of predefined Linux client operations */ |