This is a resubmit of the last portion of this patch (http://marc.info/?l=linux-m68k&m=123324772614580&w=2) that didn't make it into the sources.

Merging of uClinux and Linux headers brought in the code from the uClinux version, but the condition in the #elif was set wrong.

This patch fixes the #elif condition.

Thanks,

--
Maxim K.
CodeSourcery
>From c57261c33b9dbe953830698c1c0dcdbbf71cb28d Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <[email protected]>
Date: Fri, 2 Oct 2009 12:32:18 +0400
Subject: [PATCH 4/5] Fix m68k's asm/swab.h for ColdFire

The following patch makes asm/swab.h compatible with ColdFire ISA_B CPUs.

Signed-off-by: Maxim Kuvyrkov <[email protected]>
---
 arch/m68k/include/asm/swab.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h
index 5b754aa..b7b37a4 100644
--- a/arch/m68k/include/asm/swab.h
+++ b/arch/m68k/include/asm/swab.h
@@ -14,7 +14,7 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 
val)
 }
 
 #define __arch_swab32 __arch_swab32
-#elif !defined(__uClinux__)
+#elif !defined(__mcoldfire__)
 
 static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
 {
-- 
1.6.4

Reply via email to