Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / net / 802 / hippi.c

diff --git a/net/802/hippi.c b/net/802/hippi.c
index cb45ae1310cb0f9b046db9b5864f6e54fcd96fbc..6d7fed3dd99ac0bd635ab7256ab0fc210fbafe76 100644 (file)
--- a/net/802/hippi.c
+++ b/net/802/hippi.c
@@ -124,7 +124,7 @@ static int hippi_rebuild_header(struct sk_buff *skb)
  *     Determine the packet's protocol ID.
  */
  
-unsigned short hippi_type_trans(struct sk_buff *skb, struct net_device *dev)
+__be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
        struct hippi_hdr *hip;