diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 14:55:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 14:55:52 -0700 |
commit | 398477d4bd57cc33792fd93035c2763ad78629c4 (patch) | |
tree | 8a9cc1cd2f371843f6242b877cbdce9e109a06ed /include/asm-sh | |
parent | 6e936d3e9a45a4307e7f4a29ee9829e7a0464af1 (diff) | |
parent | 6d71627581e96efb3717960b79fc2167a4617977 (diff) |
Merge git://git.infradead.org/~dwmw2/khdrs-2.6
* git://git.infradead.org/~dwmw2/khdrs-2.6:
New 'make headers_install_all' target.
Use dependencies for 'make headers_install'.
[S390] Unexport <asm/z90crypt.h>, export <asm/zcrypt.h> in its place.
Remove dead netfilter_logging.h from include/linux/Kbuild
Remove offsetof() from user-visible <linux/stddef.h>
Clean up exported headers on CRIS
Fix v850 exported headers
Don't advertise (or allow) headers_{install,check} where inappropriate.
Remove UML header export
Remove ARM26 header export.
Fix H8300 exported headers.
Fix m68knommu exported headers
Fix exported headers for SPARC, SPARC64
Fix 'make headers_check' on m32r
Fix 'make headers_check' on sh64
Fix 'make headers_check' on sh
[HEADERS] Fix ARM 'make headers_check'
Initial pass of manual conflict resolution in top-level Makefile over
conflicting build rule and headers_install changes.
Diffstat (limited to 'include/asm-sh')
-rw-r--r-- | include/asm-sh/page.h | 3 | ||||
-rw-r--r-- | include/asm-sh/ptrace.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-sh/page.h b/include/asm-sh/page.h index 5a057b00f19..6f7eb8a3aba 100644 --- a/include/asm-sh/page.h +++ b/include/asm-sh/page.h @@ -112,9 +112,8 @@ typedef struct { unsigned long pgprot; } pgprot_t; #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#endif /* __KERNEL__ */ - #include <asm-generic/memory_model.h> #include <asm-generic/page.h> +#endif /* __KERNEL__ */ #endif /* __ASM_SH_PAGE_H */ diff --git a/include/asm-sh/ptrace.h b/include/asm-sh/ptrace.h index 792fc35bd62..ed358a376e6 100644 --- a/include/asm-sh/ptrace.h +++ b/include/asm-sh/ptrace.h @@ -1,8 +1,6 @@ #ifndef __ASM_SH_PTRACE_H #define __ASM_SH_PTRACE_H -#include <asm/ubc.h> - /* * Copyright (C) 1999, 2000 Niibe Yutaka * |