diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /net/ipx | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'net/ipx')
| -rw-r--r-- | net/ipx/ipx_proc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c index db32ac8e79..4226e71ae1 100644 --- a/net/ipx/ipx_proc.c +++ b/net/ipx/ipx_proc.c | |||
| @@ -286,21 +286,21 @@ out: | |||
| 286 | return 0; | 286 | return 0; |
| 287 | } | 287 | } |
| 288 | 288 | ||
| 289 | static struct seq_operations ipx_seq_interface_ops = { | 289 | static const struct seq_operations ipx_seq_interface_ops = { |
| 290 | .start = ipx_seq_interface_start, | 290 | .start = ipx_seq_interface_start, |
| 291 | .next = ipx_seq_interface_next, | 291 | .next = ipx_seq_interface_next, |
| 292 | .stop = ipx_seq_interface_stop, | 292 | .stop = ipx_seq_interface_stop, |
| 293 | .show = ipx_seq_interface_show, | 293 | .show = ipx_seq_interface_show, |
| 294 | }; | 294 | }; |
| 295 | 295 | ||
| 296 | static struct seq_operations ipx_seq_route_ops = { | 296 | static const struct seq_operations ipx_seq_route_ops = { |
| 297 | .start = ipx_seq_route_start, | 297 | .start = ipx_seq_route_start, |
| 298 | .next = ipx_seq_route_next, | 298 | .next = ipx_seq_route_next, |
| 299 | .stop = ipx_seq_route_stop, | 299 | .stop = ipx_seq_route_stop, |
| 300 | .show = ipx_seq_route_show, | 300 | .show = ipx_seq_route_show, |
| 301 | }; | 301 | }; |
| 302 | 302 | ||
| 303 | static struct seq_operations ipx_seq_socket_ops = { | 303 | static const struct seq_operations ipx_seq_socket_ops = { |
| 304 | .start = ipx_seq_socket_start, | 304 | .start = ipx_seq_socket_start, |
| 305 | .next = ipx_seq_socket_next, | 305 | .next = ipx_seq_socket_next, |
| 306 | .stop = ipx_seq_interface_stop, | 306 | .stop = ipx_seq_interface_stop, |