diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-01 19:32:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-01 19:32:03 -0400 |
| commit | 16a789c11df5069576ef89f817348dbc6f3bd87e (patch) | |
| tree | dddca32c59bc15a4570e4b449072b455eb7a97ce /fs/cifs/cifsproto.h | |
| parent | 72a95d14f5047d9efb1e82a9f0b9f230f06d6e3d (diff) | |
| parent | 7e2987503dda95a5f80290bb8c06279009c2419e (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
Diffstat (limited to 'fs/cifs/cifsproto.h')
| -rw-r--r-- | fs/cifs/cifsproto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 0010511083fc..ea239dea571e 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h | |||
| @@ -228,7 +228,7 @@ extern int CIFSGetSrvInodeNumber(const int xid, struct cifsTconInfo *tcon, | |||
| 228 | const struct nls_table *nls_codepage, | 228 | const struct nls_table *nls_codepage, |
| 229 | int remap_special_chars); | 229 | int remap_special_chars); |
| 230 | #endif /* CONFIG_CIFS_EXPERIMENTAL */ | 230 | #endif /* CONFIG_CIFS_EXPERIMENTAL */ |
| 231 | extern int cifs_convertUCSpath(char *target, const __u16 *source, int maxlen, | 231 | extern int cifs_convertUCSpath(char *target, const __le16 *source, int maxlen, |
| 232 | const struct nls_table * codepage); | 232 | const struct nls_table * codepage); |
| 233 | extern int cifsConvertToUCS(__le16 * target, const char *source, int maxlen, | 233 | extern int cifsConvertToUCS(__le16 * target, const char *source, int maxlen, |
| 234 | const struct nls_table * cp, int mapChars); | 234 | const struct nls_table * cp, int mapChars); |