diff options
| author | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-11-03 10:11:27 -0400 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-11-03 10:11:27 -0400 |
| commit | 8f987768eb99631374f4ab0bb19cd062baf1397d (patch) | |
| tree | b89aa5c207f7ba6a688f45657424b937f17ceb8a /include/linux/sunrpc/auth.h | |
| parent | 63f7526f26f0a9291ac3f7a986aa18ebfb61ec19 (diff) | |
| parent | c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 (diff) | |
Merge commit 'v2.6.37-rc1' into for-2.6.37
Diffstat (limited to 'include/linux/sunrpc/auth.h')
| -rw-r--r-- | include/linux/sunrpc/auth.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h index 5bbc447175dc..b2024757edd5 100644 --- a/include/linux/sunrpc/auth.h +++ b/include/linux/sunrpc/auth.h | |||
| @@ -122,8 +122,8 @@ extern const struct rpc_authops authnull_ops; | |||
| 122 | int __init rpc_init_authunix(void); | 122 | int __init rpc_init_authunix(void); |
| 123 | int __init rpc_init_generic_auth(void); | 123 | int __init rpc_init_generic_auth(void); |
| 124 | int __init rpcauth_init_module(void); | 124 | int __init rpcauth_init_module(void); |
| 125 | void __exit rpcauth_remove_module(void); | 125 | void rpcauth_remove_module(void); |
| 126 | void __exit rpc_destroy_generic_auth(void); | 126 | void rpc_destroy_generic_auth(void); |
| 127 | void rpc_destroy_authunix(void); | 127 | void rpc_destroy_authunix(void); |
| 128 | 128 | ||
| 129 | struct rpc_cred * rpc_lookup_cred(void); | 129 | struct rpc_cred * rpc_lookup_cred(void); |