Merge branch 'acpi-pm' into fixes

[~andy/linux] / drivers / connector / connector.c

diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 7b695913cb309afa55f253eb7ae2273945dda041..f1b7e244bfc153f5cdba58f113de17332516119a 100644 (file)
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -276,7 +276,7 @@ static int cn_init(void)
 
        cn_already_initialized = 1;
 
-       proc_net_fops_create(&init_net, "connector", S_IRUGO, &cn_file_ops);
+       proc_create("connector", S_IRUGO, init_net.proc_net, &cn_file_ops);
 
        return 0;
 }
@@ -287,7 +287,7 @@ static void cn_fini(void)
 
        cn_already_initialized = 0;
 
-       proc_net_remove(&init_net, "connector");
+       remove_proc_entry("connector", init_net.proc_net);
 
        cn_queue_free_dev(dev->cbdev);
        netlink_kernel_release(dev->nls);