diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/linux/nfs3.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/linux/nfs3.h')
| -rw-r--r-- | include/linux/nfs3.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/nfs3.h b/include/linux/nfs3.h index 539f3b550eab..ac33806ec7f9 100644 --- a/include/linux/nfs3.h +++ b/include/linux/nfs3.h | |||
| @@ -88,12 +88,7 @@ struct nfs3_fh { | |||
| 88 | #define NFS3PROC_PATHCONF 20 | 88 | #define NFS3PROC_PATHCONF 20 |
| 89 | #define NFS3PROC_COMMIT 21 | 89 | #define NFS3PROC_COMMIT 21 |
| 90 | 90 | ||
| 91 | #define NFS_MNT3_PROGRAM 100005 | ||
| 92 | #define NFS_MNT3_VERSION 3 | 91 | #define NFS_MNT3_VERSION 3 |
| 93 | #define MOUNTPROC3_NULL 0 | ||
| 94 | #define MOUNTPROC3_MNT 1 | ||
| 95 | #define MOUNTPROC3_UMNT 3 | ||
| 96 | #define MOUNTPROC3_UMNTALL 4 | ||
| 97 | 92 | ||
| 98 | 93 | ||
| 99 | #if defined(__KERNEL__) | 94 | #if defined(__KERNEL__) |