Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/cifs/export.c

1 files changed, 3 insertions, 3 deletions

diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
index 96001f0c64..7405b9c5b7 100644
--- a/net/x25/x25_proc.c
+++ b/net/x25/x25_proc.c
@@ -234,21 +234,21 @@ out:
         return 0;
 }
 
-static struct seq_operations x25_seq_route_ops = {
+static const struct seq_operations x25_seq_route_ops = {
         .start  = x25_seq_route_start,
         .next   = x25_seq_route_next,
         .stop   = x25_seq_route_stop,
         .show   = x25_seq_route_show,
 };
 
-static struct seq_operations x25_seq_socket_ops = {
+static const struct seq_operations x25_seq_socket_ops = {
         .start  = x25_seq_socket_start,
         .next   = x25_seq_socket_next,
         .stop   = x25_seq_socket_stop,
         .show   = x25_seq_socket_show,
 };
 
-static struct seq_operations x25_seq_forward_ops = {
+static const struct seq_operations x25_seq_forward_ops = {
         .start  = x25_seq_forward_start,
         .next   = x25_seq_forward_next,
         .stop   = x25_seq_forward_stop,