Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 3 insertions, 16 deletions

diff --git a/crypto/proc.c b/crypto/proc.c
index 5dc07e442fca..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;
@@ -115,13 +109,6 @@ static int c_show(struct seq_file *m, void *p)
                 seq_printf(m, "max keysize  : %u\n",
                                         alg->cra_cipher.cia_max_keysize);
                 break;
-                
-        case CRYPTO_ALG_TYPE_DIGEST:
-                seq_printf(m, "type         : digest\n");
-                seq_printf(m, "blocksize    : %u\n", alg->cra_blocksize);
-                seq_printf(m, "digestsize   : %u\n",
-                           alg->cra_digest.dia_digestsize);
-                break;
         case CRYPTO_ALG_TYPE_COMPRESS:
                 seq_printf(m, "type         : compression\n");
                 break;