diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /net/l2tp/l2tp_ip.c | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'net/l2tp/l2tp_ip.c')
| -rw-r--r-- | net/l2tp/l2tp_ip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index 1c770c0644d1..0bf6a59545ab 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c | |||
| @@ -576,7 +576,7 @@ out: | |||
| 576 | return copied; | 576 | return copied; |
| 577 | } | 577 | } |
| 578 | 578 | ||
| 579 | struct proto l2tp_ip_prot = { | 579 | static struct proto l2tp_ip_prot = { |
| 580 | .name = "L2TP/IP", | 580 | .name = "L2TP/IP", |
| 581 | .owner = THIS_MODULE, | 581 | .owner = THIS_MODULE, |
| 582 | .init = l2tp_ip_open, | 582 | .init = l2tp_ip_open, |