From 1ba365f728ad34a3de2cef3e968f6038b7d8c9de Mon Sep 17 00:00:00 2001
From: Dave Martin <dave.martin@linaro.org>
Date: Thu, 24 Nov 2011 12:23:18 +0100
Subject: [PATCH] --- yaml --- r: 279785 b: refs/heads/master c:
 df0e74da6df1568e3722466f85f2f08324bc767e h: refs/heads/master i:   279783:
 55ab82bd0ab73586fe50acad857b6419729e4825 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/arm/include/asm/swab.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 594b6d574301..02e1dcd96832 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7dbaa466780a754154531b44c2086f6618cee3a8
+refs/heads/master: df0e74da6df1568e3722466f85f2f08324bc767e
diff --git a/trunk/arch/arm/include/asm/swab.h b/trunk/arch/arm/include/asm/swab.h
index 9997ad20eff1..32ee164a2f6b 100644
--- a/trunk/arch/arm/include/asm/swab.h
+++ b/trunk/arch/arm/include/asm/swab.h
@@ -24,12 +24,13 @@
 
 #if defined(__KERNEL__) && __LINUX_ARM_ARCH__ >= 6
 
-static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
+static inline __attribute_const__ __u32 __arch_swahb32(__u32 x)
 {
 	__asm__ ("rev16 %0, %1" : "=r" (x) : "r" (x));
 	return x;
 }
-#define __arch_swab16 __arch_swab16
+#define __arch_swahb32 __arch_swahb32
+#define __arch_swab16(x) ((__u16)__arch_swahb32(x))
 
 static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
 {