Merge with /home/shaggy/git/linus-clean/

[linux-2.6-omap-h63xx.git] / drivers / s390 / net / qeth_main.c

diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index 3cb88c770037fd306490b39e07b06ad38ab1ce09..8f4d2999af8ebafe3721222f9038a58ee0db137e 100644 (file)
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -2210,7 +2210,7 @@ no_mem:
        return NULL;
 }
 
-static inline unsigned short
+static inline __be16
 qeth_type_trans(struct sk_buff *skb, struct net_device *dev)
 {
        struct qeth_card *card;