git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
s390
/
net
/
qeth_main.c
diff --git
a/drivers/s390/net/qeth_main.c
b/drivers/s390/net/qeth_main.c
index
3cb88c7
..
8f4d299
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;