diff --git a/[refs] b/[refs]
index 884df92a7e8b..82107b6bc571 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd87147eed934eaff92869f3d158697c7239d1d2
+refs/heads/master: f852640e74f71e6dd38146e1149ec1fe6da2fb07
diff --git a/trunk/include/net/ax25.h b/trunk/include/net/ax25.h
index 9e6368a54547..828a3a93dda1 100644
--- a/trunk/include/net/ax25.h
+++ b/trunk/include/net/ax25.h
@@ -220,7 +220,7 @@ static __inline__ void ax25_cb_put(ax25_cb *ax25)
 	}
 }
 
-static inline unsigned short ax25_type_trans(struct sk_buff *skb, struct net_device *dev)
+static inline __be16 ax25_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
 	skb->dev      = dev;
 	skb->pkt_type = PACKET_HOST;