Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[sfrench/cifs-2.6.git] / net / ax25 / af_ax25.c

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 6ded95272a537636b0673b5ba040620d287e6049..c83cf84329700219ed4d16710bebcc5a4cb9f2c6 100644 (file)
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -23,7 +23,6 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/string.h>
-#include <linux/smp_lock.h>
 #include <linux/sockios.h>
 #include <linux/net.h>
 #include <net/ax25.h>
@@ -1925,7 +1924,7 @@ static int ax25_info_show(struct seq_file *seq, void *v)
        return 0;
 }
 
-static struct seq_operations ax25_info_seqops = {
+static const struct seq_operations ax25_info_seqops = {
        .start = ax25_info_start,
        .next = ax25_info_next,
        .stop = ax25_info_stop,