diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 19:18:46 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 19:18:46 +1100 |
commit | d707953c5a68f4e4deea9cf72ac815f6836270cd (patch) | |
tree | 640e68b10511f7fdfb128471a719a977a61c2d62 /crypto | |
parent | 6490325d3a3e7c7ad6ccd94e940f0a798412dea2 (diff) | |
parent | c656ae95d1c5c8ed5763356263ace2d03087efec (diff) |
Merge remote branch 'sysctl/master'
Conflicts:
net/ipv6/addrconf.c
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/proc.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/crypto/proc.c b/crypto/proc.c index ff4cb4a357f9..58fef67d4f4d 100644 --- a/crypto/proc.c +++ b/crypto/proc.c @@ -25,28 +25,22 @@ #ifdef CONFIG_CRYPTO_FIPS static struct ctl_table crypto_sysctl_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "fips_enabled", .data = &fips_enabled, .maxlen = sizeof(int), .mode = 0444, - .proc_handler = &proc_dointvec - }, - { - .ctl_name = 0, + .proc_handler = proc_dointvec }, + {} }; static struct ctl_table crypto_dir_table[] = { { - .ctl_name = CTL_UNNUMBERED, .procname = "crypto", .mode = 0555, .child = crypto_sysctl_table }, - { - .ctl_name = 0, - }, + {} }; static struct ctl_table_header *crypto_sysctls; |