---

yaml --- r: 139965 b: refs/heads/master c: af85fe9 h: refs/heads/master i: 139963: c073880 v: v3
git-mirror · Mar 24, 2009 · ac04f28 · ac04f28
1 parent 51c14f5
commit ac04f28
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 42 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f358cbcd49027d3a58c1f29dbf02a8369bfedcf7
+refs/heads/master: af85fe9e5e618de205ac6944ed9fe45ade0874bf
diff --git a/trunk/arch/m68k/include/asm/unaligned.h b/trunk/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 */
diff --git a/trunk/arch/m68k/include/asm/unaligned_mm.h b/trunk/arch/m68k/include/asm/unaligned_mm.h
diff --git a/trunk/arch/m68k/include/asm/unaligned_no.h b/trunk/arch/m68k/include/asm/unaligned_no.h