Phonet: allow phonet_device_init() to fail, put it to __init section

[safe/jmp/linux-2.6] / net / phonet / pn_dev.c

diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index 5491bf5..af49db0 100644 (file)
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -188,9 +188,11 @@ static struct notifier_block phonet_device_notifier = {
 };
 
 /* Initialize Phonet devices list */
-void phonet_device_init(void)
+int __init phonet_device_init(void)
 {
        register_netdevice_notifier(&phonet_device_notifier);
+       phonet_netlink_register();
+       return 0;
 }
 
 void phonet_device_exit(void)