diff options
| author | Grant Likely | 2010-01-28 22:38:25 +0100 |
|---|---|---|
| committer | Grant Likely | 2010-01-28 22:38:25 +0100 |
| commit | 0ada0a73120c28cc432bcdbac061781465c2f48f (patch) | |
| tree | d17cadd4ea47e25d9e48e7d409a39c84268fbd27 /net/dccp/sysctl.c | |
| parent | of: unify phandle name in struct device_node (diff) | |
| parent | Linux 2.6.33-rc5 (diff) | |
| download | kernel-qcow2-linux-0ada0a73120c28cc432bcdbac061781465c2f48f.tar.gz kernel-qcow2-linux-0ada0a73120c28cc432bcdbac061781465c2f48f.tar.xz kernel-qcow2-linux-0ada0a73120c28cc432bcdbac061781465c2f48f.zip | |
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
Diffstat (limited to 'net/dccp/sysctl.c')
| -rw-r--r-- | net/dccp/sysctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c index a5a1856234e7..563943822e58 100644 --- a/net/dccp/sysctl.c +++ b/net/dccp/sysctl.c @@ -93,13 +93,13 @@ static struct ctl_table dccp_default_table[] = { .proc_handler = proc_dointvec_ms_jiffies, }, - { .ctl_name = 0, } + { } }; static struct ctl_path dccp_path[] = { - { .procname = "net", .ctl_name = CTL_NET, }, - { .procname = "dccp", .ctl_name = NET_DCCP, }, - { .procname = "default", .ctl_name = NET_DCCP_DEFAULT, }, + { .procname = "net", }, + { .procname = "dccp", }, + { .procname = "default", }, { } }; |