diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-06-05 14:42:27 -0400 |
| commit | dea58b80f2625d3712645fb6ff0af45866cedaae (patch) | |
| tree | b9c0d4f7d4fcd90e438b5cc5d05471e52615a62d /fs/cifs/cifsfs.h | |
| parent | b1141f6d5dead296adcabd4a1e8ea2b994e287cb (diff) | |
| parent | 672c6108a51bf559d19595d9f8193dfd81f0f752 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'fs/cifs/cifsfs.h')
| -rw-r--r-- | fs/cifs/cifsfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index 4e829dc672a6..c98755dca868 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h | |||
| @@ -99,5 +99,5 @@ extern ssize_t cifs_getxattr(struct dentry *, const char *, void *, size_t); | |||
| 99 | extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); | 99 | extern ssize_t cifs_listxattr(struct dentry *, char *, size_t); |
| 100 | extern int cifs_ioctl (struct inode * inode, struct file * filep, | 100 | extern int cifs_ioctl (struct inode * inode, struct file * filep, |
| 101 | unsigned int command, unsigned long arg); | 101 | unsigned int command, unsigned long arg); |
| 102 | #define CIFS_VERSION "1.42" | 102 | #define CIFS_VERSION "1.43" |
| 103 | #endif /* _CIFSFS_H */ | 103 | #endif /* _CIFSFS_H */ |