Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / arch / frv / kernel / sysctl.c

diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c
index 2f4da32fba20011eafefdeb84d8d6f25b248fcdb..3e9d7e03fb95b35cd94bf4779b667641ea8df528 100644 (file)
--- a/arch/frv/kernel/sysctl.c
+++ b/arch/frv/kernel/sysctl.c
@@ -175,11 +175,25 @@ static int procctl_frv_pin_cxnr(ctl_table *table, int write, struct file *filp,
  */
 static struct ctl_table frv_table[] =
 {
-       { 1, "cache-mode",      NULL, 0, 0644, NULL, &procctl_frv_cachemode },
+       {
+               .ctl_name       = 1,
+               .procname       = "cache-mode",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0644,
+               .proc_handler   = &procctl_frv_cachemode,
+       },
 #ifdef CONFIG_MMU
-       { 2, "pin-cxnr",        NULL, 0, 0644, NULL, &procctl_frv_pin_cxnr },
+       {
+               .ctl_name       = 2,
+               .procname       = "pin-cxnr",
+               .data           = NULL,
+               .maxlen         = 0,
+               .mode           = 0644,
+               .proc_handler   = &procctl_frv_pin_cxnr
+       },
 #endif
-       { 0 }
+       {}
 };
 
 /*
@@ -188,8 +202,13 @@ static struct ctl_table frv_table[] =
  */
 static struct ctl_table frv_dir_table[] =
 {
-       {CTL_FRV, "frv", NULL, 0, 0555, frv_table},
-       {0}
+       {
+               .ctl_name       = CTL_FRV,
+               .procname       = "frv",
+               .mode           = 0555,
+               .child          = frv_table
+       },
+       {}
 };
 
 /*
@@ -197,7 +216,7 @@ static struct ctl_table frv_dir_table[] =
  */
 static int __init frv_sysctl_init(void)
 {
-       register_sysctl_table(frv_dir_table, 1);
+       register_sysctl_table(frv_dir_table);
        return 0;
 }