git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
fs
/
cifs
/
cifs_unicode.c
diff --git
a/fs/cifs/cifs_unicode.c
b/fs/cifs/cifs_unicode.c
index
b5903b8
..
7d75272
100644
(file)
--- a/
fs/cifs/cifs_unicode.c
+++ b/
fs/cifs/cifs_unicode.c
@@
-32,7
+32,7
@@
*
*/
int
*
*/
int
-cifs_strfromUCS_le(char *to, const __le16 *
from,
+cifs_strfromUCS_le(char *to, const __le16 *from,
int len, const struct nls_table *codepage)
{
int i;
int len, const struct nls_table *codepage)
{
int i;
@@
-61,7
+61,7
@@
cifs_strfromUCS_le(char *to, const __le16 * from,
*
*/
int
*
*/
int
-cifs_strtoUCS(__le16 *
to, const char *from, int len,
+cifs_strtoUCS(__le16 *to, const char *from, int len,
const struct nls_table *codepage)
{
int charlen;
const struct nls_table *codepage)
{
int charlen;