aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/unaligned.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2009-01-29 16:50:22 +1000
committerGreg Ungerer <gerg@uclinux.org>2009-03-24 15:17:42 +1000
commitaf85fe9e5e618de205ac6944ed9fe45ade0874bf (patch)
tree20688e23a787ada5a95dd593e616206535ad4aa3 /arch/m68k/include/asm/unaligned.h
parentf358cbcd49027d3a58c1f29dbf02a8369bfedcf7 (diff)
downloadkernel_samsung_smdk4412-af85fe9e5e618de205ac6944ed9fe45ade0874bf.zip
kernel_samsung_smdk4412-af85fe9e5e618de205ac6944ed9fe45ade0874bf.tar.gz
kernel_samsung_smdk4412-af85fe9e5e618de205ac6944ed9fe45ade0874bf.tar.bz2
m68k: use non-mmu version of unaligned.h for all m68k
The non-mmu version is appropriately ifdef'ed to be used "as is" on all m68k varients. So switch to it as the only unaligned.h. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/unaligned.h')
-rw-r--r--arch/m68k/include/asm/unaligned.h26
1 files changed, 23 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/unaligned.h b/arch/m68k/include/asm/unaligned.h
index c640bba..eb1ea4c 100644
--- a/arch/m68k/include/asm/unaligned.h
+++ b/arch/m68k/include/asm/unaligned.h
@@ -1,5 +1,25 @@
-#ifdef __uClinux__
-#include "unaligned_no.h"
+#ifndef _ASM_M68KNOMMU_UNALIGNED_H
+#define _ASM_M68KNOMMU_UNALIGNED_H
+
+
+#ifdef CONFIG_COLDFIRE
+#include <linux/unaligned/be_struct.h>
+#include <linux/unaligned/le_byteshift.h>
+#include <linux/unaligned/generic.h>
+
+#define get_unaligned __get_unaligned_be
+#define put_unaligned __put_unaligned_be
+
#else
-#include "unaligned_mm.h"
+/*
+ * The m68k can do unaligned accesses itself.
+ */
+#include <linux/unaligned/access_ok.h>
+#include <linux/unaligned/generic.h>
+
+#define get_unaligned __get_unaligned_be
+#define put_unaligned __put_unaligned_be
+
#endif
+
+#endif /* _ASM_M68KNOMMU_UNALIGNED_H */