aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan/hdlc_raw.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@tglx.tec.linutronix.de>2005-07-13 10:45:00 +0200
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-07-13 10:45:00 +0200
commit1b3035b7fcc72b6b36f2a3634dad832eb2453ce8 (patch)
tree728174d72943cc9b981a5843553551df62eddc41 /drivers/net/wan/hdlc_raw.c
parenta98a5d04f400ad112e59cadd739dbabf89417e60 (diff)
parentc32511e2718618f0b53479eb36e07439aa363a74 (diff)
downloadkernel_samsung_smdk4412-1b3035b7fcc72b6b36f2a3634dad832eb2453ce8.zip
kernel_samsung_smdk4412-1b3035b7fcc72b6b36f2a3634dad832eb2453ce8.tar.gz
kernel_samsung_smdk4412-1b3035b7fcc72b6b36f2a3634dad832eb2453ce8.tar.bz2
Merge with rsync://fileserver/linux
Diffstat (limited to 'drivers/net/wan/hdlc_raw.c')
-rw-r--r--drivers/net/wan/hdlc_raw.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wan/hdlc_raw.c b/drivers/net/wan/hdlc_raw.c
index c41fb70..9456d31 100644
--- a/drivers/net/wan/hdlc_raw.c
+++ b/drivers/net/wan/hdlc_raw.c
@@ -24,8 +24,7 @@
#include <linux/hdlc.h>
-static unsigned short raw_type_trans(struct sk_buff *skb,
- struct net_device *dev)
+static __be16 raw_type_trans(struct sk_buff *skb, struct net_device *dev)
{
return __constant_htons(ETH_P_IP);
}