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 /arch | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
parent | New 'make headers_install_all' target. (diff) | |
download | linux-dev-398477d4bd57cc33792fd93035c2763ad78629c4.tar.xz linux-dev-398477d4bd57cc33792fd93035c2763ad78629c4.zip |
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 'arch')
-rw-r--r-- | arch/sh/kernel/process.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c index 22dc9c21201d..f2031314cb2b 100644 --- a/arch/sh/kernel/process.c +++ b/arch/sh/kernel/process.c @@ -26,6 +26,7 @@ #include <asm/uaccess.h> #include <asm/mmu_context.h> #include <asm/elf.h> +#include <asm/ubc.h> static int hlt_counter=0; |