diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-17 08:39:39 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-21 08:41:35 +0100 |
| commit | 47dbec79d1b9ce9e80bed932f345adc92049f05d (patch) | |
| tree | b03f432ff18e1356c5901776040a94c83978f412 /include/asm-m32r | |
| parent | 029669da25efa18ee4b8911e694fdcf4a11c8cbe (diff) | |
Fix 'make headers_check' on m32r
> asm-m32r/page.h requires asm-generic/memory_model.h, which does not exist
> asm-m32r/ptrace.h requires asm/m32r.h, which does not exist
> asm-m32r/signal.h requires linux/linkage.h, which does not exist
> asm-m32r/unistd.h requires asm/syscall.h, which does not exist
> asm-m32r/user.h requires asm/processor.h, which does not exist
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-m32r')
| -rw-r--r-- | include/asm-m32r/page.h | 3 | ||||
| -rw-r--r-- | include/asm-m32r/ptrace.h | 4 | ||||
| -rw-r--r-- | include/asm-m32r/signal.h | 1 | ||||
| -rw-r--r-- | include/asm-m32r/unistd.h | 4 | ||||
| -rw-r--r-- | include/asm-m32r/user.h | 1 |
5 files changed, 5 insertions, 8 deletions
diff --git a/include/asm-m32r/page.h b/include/asm-m32r/page.h index 9688be003620..404a4c24007b 100644 --- a/include/asm-m32r/page.h +++ b/include/asm-m32r/page.h @@ -87,10 +87,9 @@ typedef struct { unsigned long pgprot; } pgprot_t; #define devmem_is_allowed(x) 1 -#endif /* __KERNEL__ */ - #include <asm-generic/memory_model.h> #include <asm-generic/page.h> +#endif /* __KERNEL__ */ #endif /* _ASM_M32R_PAGE_H */ diff --git a/include/asm-m32r/ptrace.h b/include/asm-m32r/ptrace.h index a07fa90314d2..2d2a6c97331e 100644 --- a/include/asm-m32r/ptrace.h +++ b/include/asm-m32r/ptrace.h @@ -12,8 +12,6 @@ * Copyright (C) 2001-2002, 2004 Hirokazu Takata <takata at linux-m32r.org> */ -#include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */ - /* 0 - 13 are integer registers (general purpose registers). */ #define PT_R4 0 #define PT_R5 1 @@ -140,6 +138,8 @@ struct pt_regs { #ifdef __KERNEL__ +#include <asm/m32r.h> /* M32R_PSW_BSM, M32R_PSW_BPM */ + #define __ARCH_SYS_PTRACE 1 #if defined(CONFIG_ISA_M32R2) || defined(CONFIG_CHIP_VDEC2) diff --git a/include/asm-m32r/signal.h b/include/asm-m32r/signal.h index e750045164d4..65423bed32b1 100644 --- a/include/asm-m32r/signal.h +++ b/include/asm-m32r/signal.h @@ -6,7 +6,6 @@ /* orig : i386 2.4.18 */ #include <linux/types.h> -#include <linux/linkage.h> #include <linux/time.h> #include <linux/compiler.h> diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h index cc31790d8077..89f376e6229f 100644 --- a/include/asm-m32r/unistd.h +++ b/include/asm-m32r/unistd.h @@ -3,8 +3,6 @@ /* $Id$ */ -#include <asm/syscall.h> /* SYSCALL_* */ - /* * This file contains the system call numbers. */ @@ -303,6 +301,8 @@ * <asm-m32r/errno.h> */ +#include <asm/syscall.h> /* SYSCALL_* */ + #define __syscall_return(type, res) \ do { \ if ((unsigned long)(res) >= (unsigned long)(-(124 + 1))) { \ diff --git a/include/asm-m32r/user.h b/include/asm-m32r/user.h index 2ffd0c65a782..1ad4ded8483b 100644 --- a/include/asm-m32r/user.h +++ b/include/asm-m32r/user.h @@ -8,7 +8,6 @@ */ #include <linux/types.h> -#include <asm/processor.h> #include <asm/ptrace.h> #include <asm/page.h> |