diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 16:16:56 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-30 16:16:56 -0400 |
| commit | f1e095f1d206b81b44160f41278ce5c78641e9b7 (patch) | |
| tree | bd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc /include/linux/sunrpc/auth.h | |
| parent | b0438a1b71955c425c304a2a483765ef24841766 (diff) | |
| parent | 1792f17b7210280a3d7ff29da9614ba779cfcedb (diff) | |
Merge branch 'master' into for-next
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); |