aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-12 07:28:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-12 07:28:37 -0700
commit59b1c82500bb5d658891bc8e8a2308b76d58a4de (patch)
tree493aeea552ba7590b3652614b9caf2a5df11c69c /include
parent454aa3899f0bebb5aa7f8788690668d106f9a34f (diff)
parenta94a172d6c826232e623160ae134abbce181a41f (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Work around memory probing bug in openfirmware. sparc32: fix rtrap.S typo sparc32: Fix build.
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc/ptrace.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sparc/ptrace.h b/include/asm-sparc/ptrace.h
index 6b5e6ce5043..0afb867d6c1 100644
--- a/include/asm-sparc/ptrace.h
+++ b/include/asm-sparc/ptrace.h
@@ -10,6 +10,8 @@
#ifndef __ASSEMBLY__
+#include <linux/types.h>
+
struct pt_regs {
unsigned long psr;
unsigned long pc;