summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/string.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-27 10:50:54 +0100
committerIngo Molnar <mingo@elte.hu>2008-10-27 10:50:54 +0100
commit4944dd62de21230af039eda7cd218e9a09021d11 (patch)
treebac70f7bab8506c7e1b0408bacbdb0b1d77262e9 /arch/x86/include/asm/string.h
parentftrace: warning in kernel/trace/ftrace.c (diff)
parentLinux 2.6.28-rc2 (diff)
downloadlinux-4944dd62de21230af039eda7cd218e9a09021d11.tar.xz
linux-4944dd62de21230af039eda7cd218e9a09021d11.zip
Merge commit 'v2.6.28-rc2' into tracing/urgent
Diffstat (limited to 'arch/x86/include/asm/string.h')
-rw-r--r--arch/x86/include/asm/string.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/string.h b/arch/x86/include/asm/string.h
new file mode 100644
index 000000000000..6dfd6d9373a0
--- /dev/null
+++ b/arch/x86/include/asm/string.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "string_32.h"
+#else
+# include "string_64.h"
+#endif