diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /net/ipv4/tcp_probe.c | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'net/ipv4/tcp_probe.c')
| -rw-r--r-- | net/ipv4/tcp_probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c index 41c157848181..61f406f27294 100644 --- a/net/ipv4/tcp_probe.c +++ b/net/ipv4/tcp_probe.c | |||
| @@ -143,7 +143,7 @@ out_free: | |||
| 143 | return error ? error : cnt; | 143 | return error ? error : cnt; |
| 144 | } | 144 | } |
| 145 | 145 | ||
| 146 | static struct file_operations tcpprobe_fops = { | 146 | static const struct file_operations tcpprobe_fops = { |
| 147 | .owner = THIS_MODULE, | 147 | .owner = THIS_MODULE, |
| 148 | .open = tcpprobe_open, | 148 | .open = tcpprobe_open, |
| 149 | .read = tcpprobe_read, | 149 | .read = tcpprobe_read, |