diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 19:25:34 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 19:25:34 +0400 |
| commit | 6fbfd0592ef88ba29cdce84ef92757351f1fa9c9 (patch) | |
| tree | 7c0af4bcc08f3ad7befb93d73d9729f82252c950 /arch/sh/include/asm/uaccess_64.h | |
| parent | f2c32a882d2c1cde6fc552a5a3d34b4c1330edb8 (diff) | |
| parent | 6887a4131da3adaab011613776d865f4bcfb5678 (diff) | |
| download | linux-6fbfd0592ef88ba29cdce84ef92757351f1fa9c9.tar.xz | |
Merge v3.5-rc5 into driver-core-next
This picks up the big printk fixes, and resolves a merge issue with:
drivers/extcon/extcon_gpio.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sh/include/asm/uaccess_64.h')
| -rw-r--r-- | arch/sh/include/asm/uaccess_64.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sh/include/asm/uaccess_64.h b/arch/sh/include/asm/uaccess_64.h index 56fd20b8cdcc..2e07e0f40c6a 100644 --- a/arch/sh/include/asm/uaccess_64.h +++ b/arch/sh/include/asm/uaccess_64.h @@ -84,8 +84,4 @@ extern long __put_user_asm_l(void *, long); extern long __put_user_asm_q(void *, long); extern void __put_user_unknown(void); -extern long __strnlen_user(const char *__s, long __n); -extern int __strncpy_from_user(unsigned long __dest, - unsigned long __user __src, int __count); - #endif /* __ASM_SH_UACCESS_64_H */ |