Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / include / linux / fddidevice.h

diff --git a/include/linux/fddidevice.h b/include/linux/fddidevice.h
index 002f6367697d8b8d1ad5d83a5df4aa060e222616..e61e42dfd3175c5436c8130b16963bfea2052d3e 100644 (file)
--- a/include/linux/fddidevice.h
+++ b/include/linux/fddidevice.h
@@ -25,7 +25,7 @@
 #include <linux/if_fddi.h>
 
 #ifdef __KERNEL__
-extern unsigned short  fddi_type_trans(struct sk_buff *skb,
+extern __be16  fddi_type_trans(struct sk_buff *skb,
                                struct net_device *dev);
 extern struct net_device *alloc_fddidev(int sizeof_priv);
 #endif