Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...

[mv-sheeva.git] / include / linux / trdevice.h

diff --git a/include/linux/trdevice.h b/include/linux/trdevice.h
index 99e02ef54c47db8fa1e9ceff2644acb9c2b98b38..bfc84a7aecc5288a762b8d0d5303f2ba17f34d42 100644 (file)
--- a/include/linux/trdevice.h
+++ b/include/linux/trdevice.h
@@ -28,7 +28,7 @@
 #include <linux/if_tr.h>
 
 #ifdef __KERNEL__
-extern unsigned short  tr_type_trans(struct sk_buff *skb, struct net_device *dev);
+extern __be16 tr_type_trans(struct sk_buff *skb, struct net_device *dev);
 extern void tr_source_route(struct sk_buff *skb, struct trh_hdr *trh, struct net_device *dev);
 extern struct net_device *alloc_trdev(int sizeof_priv);