ALSA: hda: Use LPIB for another mainboard

[safe/jmp/linux-2.6] / net / appletalk / sysctl_net_atalk.c

diff --git a/net/appletalk/sysctl_net_atalk.c b/net/appletalk/sysctl_net_atalk.c
index 7df1778..04e9c0d 100644 (file)
--- a/net/appletalk/sysctl_net_atalk.c
+++ b/net/appletalk/sysctl_net_atalk.c
@@ -12,68 +12,47 @@
 
 static struct ctl_table atalk_table[] = {
        {
-               .ctl_name       = NET_ATALK_AARP_EXPIRY_TIME,
                .procname       = "aarp-expiry-time",
                .data           = &sysctl_aarp_expiry_time,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec_jiffies,
-               .strategy       = &sysctl_jiffies,
+               .proc_handler   = proc_dointvec_jiffies,
        },
        {
-               .ctl_name       = NET_ATALK_AARP_TICK_TIME,
                .procname       = "aarp-tick-time",
                .data           = &sysctl_aarp_tick_time,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec_jiffies,
-               .strategy       = &sysctl_jiffies,
+               .proc_handler   = proc_dointvec_jiffies,
        },
        {
-               .ctl_name       = NET_ATALK_AARP_RETRANSMIT_LIMIT,
                .procname       = "aarp-retransmit-limit",
                .data           = &sysctl_aarp_retransmit_limit,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec,
+               .proc_handler   = proc_dointvec,
        },
        {
-               .ctl_name       = NET_ATALK_AARP_RESOLVE_TIME,
                .procname       = "aarp-resolve-time",
                .data           = &sysctl_aarp_resolve_time,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec_jiffies,
-               .strategy       = &sysctl_jiffies,
+               .proc_handler   = proc_dointvec_jiffies,
        },
-       { 0 },
+       { },
 };
 
-static struct ctl_table atalk_dir_table[] = {
-       {
-               .ctl_name       = NET_ATALK,
-               .procname       = "appletalk",
-               .mode           = 0555,
-               .child          = atalk_table,
-       },
-       { 0 },
-};
-
-static struct ctl_table atalk_root_table[] = {
-       {
-               .ctl_name       = CTL_NET,
-               .procname       = "net",
-               .mode           = 0555,
-               .child          = atalk_dir_table,
-       },
-       { 0 },
+static struct ctl_path atalk_path[] = {
+       { .procname = "net", },
+       { .procname = "appletalk", },
+       { }
 };
 
 static struct ctl_table_header *atalk_table_header;
 
 void atalk_register_sysctl(void)
 {
-       atalk_table_header = register_sysctl_table(atalk_root_table);
+       atalk_table_header = register_sysctl_paths(atalk_path, atalk_table);
 }
 
 void atalk_unregister_sysctl(void)