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

[linux-2.6] / drivers / net / plip.c

diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index f4b62405d2e5997a2639e53424481d136e776961..21537ee3a6a774ec9a3b2331d28c72ab699fbd55 100644 (file)
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -540,7 +540,7 @@ plip_receive(unsigned short nibble_timeout, struct net_device *dev,
  *     in far too many old systems not all even running Linux.
  */
  
-static unsigned short plip_type_trans(struct sk_buff *skb, struct net_device *dev)
+static __be16 plip_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
        struct ethhdr *eth;
        unsigned char *rawp;