Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[karo-tx-linux.git] / drivers / net / ppp_generic.c

diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index 4405a76ed3da197344955924ad3a3e7eef10e11e..81e7fcced4b98173ffeb74392f50f73593979dd8 100644 (file)
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -183,7 +183,7 @@ static atomic_t ppp_unit_count = ATOMIC_INIT(0);
 static atomic_t channel_count = ATOMIC_INIT(0);
 
 /* per-net private data for this module */
-static unsigned int ppp_net_id;
+static int ppp_net_id;
 struct ppp_net {
        /* units to ppp mapping */
        struct idr units_idr;
@@ -901,7 +901,7 @@ static __net_exit void ppp_exit_net(struct net *net)
        kfree(pn);
 }
 
-static __net_initdata struct pernet_operations ppp_net_ops = {
+static struct pernet_operations ppp_net_ops = {
        .init = ppp_init_net,
        .exit = ppp_exit_net,
 };