diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 17:55:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 17:55:52 -0400 |
| commit | 398477d4bd57cc33792fd93035c2763ad78629c4 (patch) | |
| tree | 8a9cc1cd2f371843f6242b877cbdce9e109a06ed /include/asm-m32r/user.h | |
| 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-m32r/user.h')
| -rw-r--r-- | include/asm-m32r/user.h | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 11 | #include <asm/processor.h> | ||
| 12 | #include <asm/ptrace.h> | 11 | #include <asm/ptrace.h> |
| 13 | #include <asm/page.h> | 12 | #include <asm/page.h> |
| 14 | 13 | ||