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/sunrpc/stats.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/sunrpc/stats.c')
| -rw-r--r-- | net/sunrpc/stats.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c index d19cd9ec6e99..2878e20ebd04 100644 --- a/net/sunrpc/stats.c +++ b/net/sunrpc/stats.c | |||
| @@ -66,7 +66,7 @@ static int rpc_proc_open(struct inode *inode, struct file *file) | |||
| 66 | return single_open(file, rpc_proc_show, PDE(inode)->data); | 66 | return single_open(file, rpc_proc_show, PDE(inode)->data); |
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | static struct file_operations rpc_proc_fops = { | 69 | static const struct file_operations rpc_proc_fops = { |
| 70 | .owner = THIS_MODULE, | 70 | .owner = THIS_MODULE, |
| 71 | .open = rpc_proc_open, | 71 | .open = rpc_proc_open, |
| 72 | .read = seq_read, | 72 | .read = seq_read, |