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/llc | |
| 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/llc')
| -rw-r--r-- | net/llc/llc_proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c index 3ab9d9f8b1..49be6c902c 100644 --- a/net/llc/llc_proc.c +++ b/net/llc/llc_proc.c | |||
| @@ -184,14 +184,14 @@ out: | |||
| 184 | return 0; | 184 | return 0; |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | static struct seq_operations llc_seq_socket_ops = { | 187 | static const struct seq_operations llc_seq_socket_ops = { |
| 188 | .start = llc_seq_start, | 188 | .start = llc_seq_start, |
| 189 | .next = llc_seq_next, | 189 | .next = llc_seq_next, |
| 190 | .stop = llc_seq_stop, | 190 | .stop = llc_seq_stop, |
| 191 | .show = llc_seq_socket_show, | 191 | .show = llc_seq_socket_show, |
| 192 | }; | 192 | }; |
| 193 | 193 | ||
| 194 | static struct seq_operations llc_seq_core_ops = { | 194 | static const struct seq_operations llc_seq_core_ops = { |
| 195 | .start = llc_seq_start, | 195 | .start = llc_seq_start, |
| 196 | .next = llc_seq_next, | 196 | .next = llc_seq_next, |
| 197 | .stop = llc_seq_stop, | 197 | .stop = llc_seq_stop, |