diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-25 15:58:38 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-04-25 15:58:38 -0400 |
| commit | ca1841de3a426de8cfac6ca61f0f54e6283d0653 (patch) | |
| tree | fc9ca7db1f9ada5301b3684ae75cfe8470071425 /net/l2tp/l2tp_eth.c | |
| parent | c5325bf1df96152c969b44cae2b8131be5621c47 (diff) | |
| parent | 8fd62c82872a5a721c9fb0071ca0f7a49c1732e4 (diff) | |
Merge commit 'v2.6.38.4' into linaro-2.6.38
Diffstat (limited to 'net/l2tp/l2tp_eth.c')
| -rw-r--r-- | net/l2tp/l2tp_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c index 8d9ce0accc9..a8193f52c13 100644 --- a/net/l2tp/l2tp_eth.c +++ b/net/l2tp/l2tp_eth.c @@ -283,7 +283,7 @@ static __net_init int l2tp_eth_init_net(struct net *net) return 0; } -static __net_initdata struct pernet_operations l2tp_eth_net_ops = { +static struct pernet_operations l2tp_eth_net_ops = { .init = l2tp_eth_init_net, .id = &l2tp_eth_net_id, .size = sizeof(struct l2tp_eth_net), |