Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers

[~andy/linux] / arch / arm / include / asm / swab.h

diff --git a/arch/arm/include/asm/swab.h b/arch/arm/include/asm/swab.h
index e82adf64d1dd727e18dd0d54781323c98a9e5c20..b859d82e30cafb5489fdb0297319a570f8362df3 100644 (file)
--- a/arch/arm/include/asm/swab.h
+++ b/arch/arm/include/asm/swab.h
@@ -25,12 +25,13 @@
 #if defined(__KERNEL__)
 #if __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)
 {