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/nfs2.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/nfs2.h')
| -rw-r--r-- | include/linux/nfs2.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/nfs2.h b/include/linux/nfs2.h index 0ed9517138fc..fde24b30cc9e 100644 --- a/include/linux/nfs2.h +++ b/include/linux/nfs2.h | |||
| @@ -64,11 +64,4 @@ struct nfs2_fh { | |||
| 64 | #define NFSPROC_READDIR 16 | 64 | #define NFSPROC_READDIR 16 |
| 65 | #define NFSPROC_STATFS 17 | 65 | #define NFSPROC_STATFS 17 |
| 66 | 66 | ||
| 67 | #define NFS_MNT_PROGRAM 100005 | ||
| 68 | #define NFS_MNT_VERSION 1 | ||
| 69 | #define MNTPROC_NULL 0 | ||
| 70 | #define MNTPROC_MNT 1 | ||
| 71 | #define MNTPROC_UMNT 3 | ||
| 72 | #define MNTPROC_UMNTALL 4 | ||
| 73 | |||
| 74 | #endif /* _LINUX_NFS2_H */ | 67 | #endif /* _LINUX_NFS2_H */ |