diff options
| author | remi.denis-courmont@nokia <remi.denis-courmont@nokia> | 2009-01-23 03:00:27 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-26 21:03:34 -0800 |
| commit | 76e02cf6945e6faa9f6b546dc0513512197c5966 (patch) | |
| tree | e296f93f6ba6571443704871bf2d399a3bc5b98e /include/net/phonet | |
| parent | 4b8f704bea70a2c8719e47f53197678a87a0c62f (diff) | |
| download | linux-76e02cf6945e6faa9f6b546dc0513512197c5966.tar.gz linux-76e02cf6945e6faa9f6b546dc0513512197c5966.tar.bz2 linux-76e02cf6945e6faa9f6b546dc0513512197c5966.zip | |
Phonet: allow phonet_device_init() to fail, put it to __init section
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/phonet')
| -rw-r--r-- | include/net/phonet/phonet.h | 1 | ||||
| -rw-r--r-- | include/net/phonet/pn_dev.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/phonet/phonet.h b/include/net/phonet/phonet.h index 057b0a8a2885..d43f71b5ec00 100644 --- a/include/net/phonet/phonet.h +++ b/include/net/phonet/phonet.h @@ -105,7 +105,6 @@ void phonet_proto_unregister(int protocol, struct phonet_protocol *pp); int phonet_sysctl_init(void); void phonet_sysctl_exit(void); -void phonet_netlink_register(void); int isi_register(void); void isi_unregister(void); diff --git a/include/net/phonet/pn_dev.h b/include/net/phonet/pn_dev.h index aa1c59a1d33f..59ae628b1111 100644 --- a/include/net/phonet/pn_dev.h +++ b/include/net/phonet/pn_dev.h @@ -36,8 +36,9 @@ struct phonet_device { DECLARE_BITMAP(addrs, 64); }; -void phonet_device_init(void); +int phonet_device_init(void); void phonet_device_exit(void); +void phonet_netlink_register(void); struct net_device *phonet_device_get(struct net *net); int phonet_address_add(struct net_device *dev, u8 addr); |