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/802 | |
| 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/802')
| -rw-r--r-- | net/802/tr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/802/tr.c b/net/802/tr.c index 0ba1946211..e56e61a7f5 100644 --- a/net/802/tr.c +++ b/net/802/tr.c | |||
| @@ -567,7 +567,7 @@ static int rif_seq_show(struct seq_file *seq, void *v) | |||
| 567 | } | 567 | } |
| 568 | 568 | ||
| 569 | 569 | ||
| 570 | static struct seq_operations rif_seq_ops = { | 570 | static const struct seq_operations rif_seq_ops = { |
| 571 | .start = rif_seq_start, | 571 | .start = rif_seq_start, |
| 572 | .next = rif_seq_next, | 572 | .next = rif_seq_next, |
| 573 | .stop = rif_seq_stop, | 573 | .stop = rif_seq_stop, |