Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / net / ax25.h

diff --git a/include/net/ax25.h b/include/net/ax25.h
index 9e6368a5454760fa9bc1c56fc691b110474094b3..828a3a93dda10e07ce851476894296f5b7e4a68f 100644 (file)
--- a/include/net/ax25.h
+++ b/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;