Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

1 files changed, 10 insertions, 10 deletions

diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 30c88b2245ff..90b5fae5d714 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -95,16 +95,16 @@ struct pppoe_tag {
 } __attribute ((packed));
 
 /* Tag identifiers */
-#define PTT_EOL         __constant_htons(0x0000)
-#define PTT_SRV_NAME    __constant_htons(0x0101)
-#define PTT_AC_NAME     __constant_htons(0x0102)
-#define PTT_HOST_UNIQ   __constant_htons(0x0103)
-#define PTT_AC_COOKIE   __constant_htons(0x0104)
-#define PTT_VENDOR      __constant_htons(0x0105)
-#define PTT_RELAY_SID   __constant_htons(0x0110)
-#define PTT_SRV_ERR     __constant_htons(0x0201)
-#define PTT_SYS_ERR     __constant_htons(0x0202)
-#define PTT_GEN_ERR     __constant_htons(0x0203)
+#define PTT_EOL         __cpu_to_be16(0x0000)
+#define PTT_SRV_NAME    __cpu_to_be16(0x0101)
+#define PTT_AC_NAME     __cpu_to_be16(0x0102)
+#define PTT_HOST_UNIQ   __cpu_to_be16(0x0103)
+#define PTT_AC_COOKIE   __cpu_to_be16(0x0104)
+#define PTT_VENDOR      __cpu_to_be16(0x0105)
+#define PTT_RELAY_SID   __cpu_to_be16(0x0110)
+#define PTT_SRV_ERR     __cpu_to_be16(0x0201)
+#define PTT_SYS_ERR     __cpu_to_be16(0x0202)
+#define PTT_GEN_ERR     __cpu_to_be16(0x0203)
 
 struct pppoe_hdr {
 #if defined(__LITTLE_ENDIAN_BITFIELD)