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 branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
include
/
linux
/
fddidevice.h
diff --git
a/include/linux/fddidevice.h
b/include/linux/fddidevice.h
index
002f636
..
e61e42d
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