Merge commit 'v2.6.29-rc4' into x86/cleanups

[linux-2.6-omap-h63xx.git] / arch / x86 / include / asm / ptrace-abi.h

diff --git a/arch/x86/include/asm/ptrace-abi.h b/arch/x86/include/asm/ptrace-abi.h
index 25f1bb8fc626ab00b14ba65fa56e4477e74afd30..8e0f8d199e0587740a51c910184798a8f96968f0 100644 (file)
--- a/arch/x86/include/asm/ptrace-abi.h
+++ b/arch/x86/include/asm/ptrace-abi.h
@@ -83,7 +83,7 @@
 #ifdef CONFIG_X86_PTRACE_BTS
 
 #ifndef __ASSEMBLY__
-#include <asm/types.h>
+#include <linux/types.h>
 
 /* configuration/status structure used in PTRACE_BTS_CONFIG and
    PTRACE_BTS_STATUS commands.