summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/sigcontext.h
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2009-03-09 21:21:07 +0800
committerEric Miao <eric.miao@marvell.com>2009-03-09 21:21:07 +0800
commitabcea2c322cef559ef2f108b4763d107a5ccc37f (patch)
tree5fec7fec372f9bdb70703f6c77bfc49cda945442 /arch/x86/include/asm/sigcontext.h
parent8118aea23c328fd4913b325af53fda9d530b1d56 (diff)
parent6d831c6554e4f95083919914955a1a3a4a6acfa9 (diff)
downloadblackbird-op-linux-abcea2c322cef559ef2f108b4763d107a5ccc37f.tar.gz
blackbird-op-linux-abcea2c322cef559ef2f108b4763d107a5ccc37f.zip
Merge branch 'devel' of ssh://master.kernel.org/home/rmk/linux-2.6-arm into devel
Diffstat (limited to 'arch/x86/include/asm/sigcontext.h')
-rw-r--r--arch/x86/include/asm/sigcontext.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/sigcontext.h b/arch/x86/include/asm/sigcontext.h
index 0afcb5e58acc..ec666491aaa4 100644
--- a/arch/x86/include/asm/sigcontext.h
+++ b/arch/x86/include/asm/sigcontext.h
@@ -2,7 +2,7 @@
#define _ASM_X86_SIGCONTEXT_H
#include <linux/compiler.h>
-#include <asm/types.h>
+#include <linux/types.h>
#define FP_XSTATE_MAGIC1 0x46505853U
#define FP_XSTATE_MAGIC2 0x46505845U
OpenPOWER on IntegriCloud