diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /drivers/net/wan/lapbether.c | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'drivers/net/wan/lapbether.c')
| -rw-r--r-- | drivers/net/wan/lapbether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 7f2e3653c5e..6c302e9dbca 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c @@ -86,7 +86,7 @@ static __inline__ int dev_is_ethdev(struct net_device *dev) /* * Receive a LAPB frame via an ethernet interface. */ -static int lapbeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype) +static int lapbeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *ptype, struct net_device *orig_dev) { int len, err; struct lapbethdev *lapbeth; |