diff options
| author | Mark Brown <broonie@kernel.org> | 2023-07-30 23:38:59 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-30 23:38:59 +0100 |
| commit | 4ee0feccf2b372134d899a01ee025739f4ddfdca (patch) | |
| tree | 8e63340fed636fb7334c61042bc364375b4d2be7 /include/linux/nls.h | |
| parent | 71ee2a4f95e205bd33e79c7bd4bece3885e0e366 (diff) | |
| parent | 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 (diff) | |
spi: Merge up fixes from Linus' tree
Gets us pine64plus back if nothing else.
Diffstat (limited to 'include/linux/nls.h')
| -rw-r--r-- | include/linux/nls.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nls.h b/include/linux/nls.h index 499e486b3722..e0bf8367b274 100644 --- a/include/linux/nls.h +++ b/include/linux/nls.h @@ -47,7 +47,7 @@ enum utf16_endian { /* nls_base.c */ extern int __register_nls(struct nls_table *, struct module *); extern int unregister_nls(struct nls_table *); -extern struct nls_table *load_nls(char *); +extern struct nls_table *load_nls(const char *charset); extern void unload_nls(struct nls_table *); extern struct nls_table *load_nls_default(void); #define register_nls(nls) __register_nls((nls), THIS_MODULE) |