Merge branch 'x86/core' into x86/apic

[karo-tx-linux.git] / include / asm-x86 / unaligned.h

diff --git a/include/asm-x86/unaligned.h b/include/asm-x86/unaligned.h
index 68067150fbcbd931d085eaa4205bf26bbb7d2c72..59dcdec37160a02127780c1b7f9a76743c2041e0 100644 (file)
--- a/include/asm-x86/unaligned.h
+++ b/include/asm-x86/unaligned.h
@@ -1,5 +1,14 @@
-#ifdef CONFIG_X86_32
-# include "unaligned_32.h"
-#else
-# include "unaligned_64.h"
-#endif
+#ifndef ASM_X86__UNALIGNED_H
+#define ASM_X86__UNALIGNED_H
+
+/*
+ * The x86 can do unaligned accesses itself.
+ */
+
+#include <linux/unaligned/access_ok.h>
+#include <linux/unaligned/generic.h>
+
+#define get_unaligned __get_unaligned_le
+#define put_unaligned __put_unaligned_le
+
+#endif /* ASM_X86__UNALIGNED_H */