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 /net/802/p8022.c | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
| download | linux-next-129521dcc94f781890f8f668219ab79f0073ff9f.tar.gz | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'net/802/p8022.c')
| -rw-r--r-- | net/802/p8022.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/802/p8022.c b/net/802/p8022.c index 5ae63416df6d..b24817c63ca8 100644 --- a/net/802/p8022.c +++ b/net/802/p8022.c @@ -35,7 +35,8 @@ static int p8022_request(struct datalink_proto *dl, struct sk_buff *skb, struct datalink_proto *register_8022_client(unsigned char type, int (*func)(struct sk_buff *skb, struct net_device *dev, - struct packet_type *pt)) + struct packet_type *pt, + struct net_device *orig_dev)) { struct datalink_proto *proto; |