diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-10-03 13:14:04 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-10-03 13:14:04 +0900 |
commit | 711fa8096863e4b50bb97f9ebc44606dc2182ac3 (patch) | |
tree | 6d0a3a76a0945db8f61957d5b7542a18ab7fc0db /include/asm-sh | |
parent | 059fbd6a5ee9a35ac9f15edb2876a50bd88a008d (diff) | |
download | linux-stable-711fa8096863e4b50bb97f9ebc44606dc2182ac3.tar.gz linux-stable-711fa8096863e4b50bb97f9ebc44606dc2182ac3.tar.bz2 linux-stable-711fa8096863e4b50bb97f9ebc44606dc2182ac3.zip |
sh: build fixes for defconfigs.
Get all of the defconfigs building again.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/asm-sh')
-rw-r--r-- | include/asm-sh/elf.h | 1 | ||||
-rw-r--r-- | include/asm-sh/rts7751r2d/rts7751r2d.h | 3 | ||||
-rw-r--r-- | include/asm-sh/string.h | 15 |
3 files changed, 14 insertions, 5 deletions
diff --git a/include/asm-sh/elf.h b/include/asm-sh/elf.h index 3a07ab40ac4d..fc050fd7645e 100644 --- a/include/asm-sh/elf.h +++ b/include/asm-sh/elf.h @@ -1,7 +1,6 @@ #ifndef __ASM_SH_ELF_H #define __ASM_SH_ELF_H -#include <asm/processor.h> #include <asm/auxvec.h> #include <asm/ptrace.h> #include <asm/user.h> diff --git a/include/asm-sh/rts7751r2d/rts7751r2d.h b/include/asm-sh/rts7751r2d/rts7751r2d.h index b112ae221fd1..796b8fcb81a8 100644 --- a/include/asm-sh/rts7751r2d/rts7751r2d.h +++ b/include/asm-sh/rts7751r2d/rts7751r2d.h @@ -68,4 +68,7 @@ #define IRQ_PCISLOT2 10 /* PCI Slot #2 IRQ */ #define IRQ_EXTENTION 11 /* EXTn IRQ */ +#define __IO_PREFIX rts7751r2d +#include <asm/io_generic.h> + #endif /* __ASM_SH_RENESAS_RTS7751R2D */ diff --git a/include/asm-sh/string.h b/include/asm-sh/string.h index 3e0cff04caec..95bc7db006b0 100644 --- a/include/asm-sh/string.h +++ b/include/asm-sh/string.h @@ -1,13 +1,15 @@ #ifndef __ASM_SH_STRING_H #define __ASM_SH_STRING_H +#ifdef __KERNEL__ + /* * Copyright (C) 1999 Niibe Yutaka * But consider these trivial functions to be public domain. */ #define __HAVE_ARCH_STRCPY -static __inline__ char *strcpy(char *__dest, const char *__src) +static inline char *strcpy(char *__dest, const char *__src) { register char *__xdest = __dest; unsigned long __dummy; @@ -26,7 +28,7 @@ static __inline__ char *strcpy(char *__dest, const char *__src) } #define __HAVE_ARCH_STRNCPY -static __inline__ char *strncpy(char *__dest, const char *__src, size_t __n) +static inline char *strncpy(char *__dest, const char *__src, size_t __n) { register char *__xdest = __dest; unsigned long __dummy; @@ -52,7 +54,7 @@ static __inline__ char *strncpy(char *__dest, const char *__src, size_t __n) } #define __HAVE_ARCH_STRCMP -static __inline__ int strcmp(const char *__cs, const char *__ct) +static inline int strcmp(const char *__cs, const char *__ct) { register int __res; unsigned long __dummy; @@ -78,7 +80,7 @@ static __inline__ int strcmp(const char *__cs, const char *__ct) } #define __HAVE_ARCH_STRNCMP -static __inline__ int strncmp(const char *__cs, const char *__ct, size_t __n) +static inline int strncmp(const char *__cs, const char *__ct, size_t __n) { register int __res; unsigned long __dummy; @@ -124,4 +126,9 @@ extern void *memchr(const void *__s, int __c, size_t __n); #define __HAVE_ARCH_STRLEN extern size_t strlen(const char *); +/* arch/sh/lib/strcasecmp.c */ +extern int strcasecmp(const char *, const char *); + +#endif /* __KERNEL__ */ + #endif /* __ASM_SH_STRING_H */ |