Merge branch 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6-omap-h63xx.git] / net / x25 / sysctl_net_x25.c

diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
index 6ebda25c24e96a4471ee7eb8aa3db69b2411075d..a5d3416522de124b7458c21641dcc2e648d03577 100644 (file)
--- a/net/x25/sysctl_net_x25.c
+++ b/net/x25/sysctl_net_x25.c
@@ -24,8 +24,8 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_restart_request_timeout,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy =     &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy =     sysctl_intvec,
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
@@ -35,8 +35,8 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_call_request_timeout,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy =     &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy =     sysctl_intvec,
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
@@ -46,8 +46,8 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_reset_request_timeout,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy =     &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy =     sysctl_intvec,
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
@@ -57,8 +57,8 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_clear_request_timeout,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy =     &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy =     sysctl_intvec,
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
@@ -68,8 +68,8 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_ack_holdback_timeout,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec_minmax,
-               .strategy =     &sysctl_intvec,
+               .proc_handler = proc_dointvec_minmax,
+               .strategy =     sysctl_intvec,
                .extra1 =       &min_timer,
                .extra2 =       &max_timer,
        },
@@ -79,7 +79,7 @@ static struct ctl_table x25_table[] = {
                .data =         &sysctl_x25_forward,
                .maxlen =       sizeof(int),
                .mode =         0644,
-               .proc_handler = &proc_dointvec,
+               .proc_handler = proc_dointvec,
        },
        { 0, },
 };