projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
[linux-2.6-block.git]
/
include
/
linux
/
hdlc.h
diff --git
a/include/linux/hdlc.h
b/include/linux/hdlc.h
index ed2927ef1ff7e5436a5257e38243066edfb8d5ef..df695e9ae32761a2bef2611c0c06b03e94fb5429 100644
(file)
--- a/
include/linux/hdlc.h
+++ b/
include/linux/hdlc.h
@@
-242,8
+242,8
@@
static __inline__ struct net_device_stats *hdlc_stats(struct net_device *dev)
}
-static __inline__
unsigned short
hdlc_type_trans(struct sk_buff *skb,
-
struct net_device *dev)
+static __inline__
__be16
hdlc_type_trans(struct sk_buff *skb,
+ struct net_device *dev)
{
hdlc_device *hdlc = dev_to_hdlc(dev);