diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 13:09:40 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 13:09:40 +0100 |
| commit | 75329f1f0c0e2e2ad611734a2ef08309391a4d9f (patch) | |
| tree | 67ca1a13f51fbf2f5af8557e6ff0bb722efab3e6 /include/net/phonet/pn_dev.h | |
| parent | b6b301aa9fba57b114c3a00f5f43abf672bd4ecd (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'include/net/phonet/pn_dev.h')
| -rw-r--r-- | include/net/phonet/pn_dev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/phonet/pn_dev.h b/include/net/phonet/pn_dev.h index bbd2a836e04c..aa1c59a1d33f 100644 --- a/include/net/phonet/pn_dev.h +++ b/include/net/phonet/pn_dev.h @@ -43,7 +43,7 @@ struct net_device *phonet_device_get(struct net *net); int phonet_address_add(struct net_device *dev, u8 addr); int phonet_address_del(struct net_device *dev, u8 addr); u8 phonet_address_get(struct net_device *dev, u8 addr); -int phonet_address_lookup(u8 addr); +int phonet_address_lookup(struct net *net, u8 addr); #define PN_NO_ADDR 0xff |