---

yaml --- r: 302682 b: refs/heads/master c: b2fb49b h: refs/heads/master v: v3
git-mirror · May 20, 2012 · d111195 · d111195
1 parent 97d3c08
commit d111195
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5641686c234ffe5fbcb1728ac45016761b318839
+refs/heads/master: b2fb49bf2af013fa84d751ec02b0610571d67896
diff --git a/trunk/arch/m68k/include/asm/unaligned.h b/trunk/arch/m68k/include/asm/unaligned.h
@@ -2,7 +2,7 @@
 #define _ASM_M68K_UNALIGNED_H
 
 
-#ifdef CONFIG_COLDFIRE
+#if defined(CONFIG_COLDFIRE) || defined(CONFIG_M68000)
 #include <linux/unaligned/be_struct.h>
 #include <linux/unaligned/le_byteshift.h>
 #include <linux/unaligned/generic.h>