diff options
author | J. Bruce Fields <bfields@redhat.com> | 2010-09-19 23:48:00 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2010-09-19 23:48:32 -0400 |
commit | c88739b373e4930ed082a607cb78bf82616fd076 (patch) | |
tree | 251d969aa816dab5a62e6b36208b189b37de6534 /crypto/testmgr.c | |
parent | 3211af1119174fbe8b676422b74870cdd51d7314 (diff) | |
parent | 827e3457022d0bb0b1bb8a0eb88501876fe7dcf0 (diff) | |
download | op-kernel-dev-c88739b373e4930ed082a607cb78bf82616fd076.zip op-kernel-dev-c88739b373e4930ed082a607cb78bf82616fd076.tar.gz |
Merge remote branch 'trond/bugfixes' into for-2.6.37
Without some client-side fixes, server testing is currently difficult.
Diffstat (limited to 'crypto/testmgr.c')
-rw-r--r-- | crypto/testmgr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c index abd980c7..fa8c8f7 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -23,7 +23,7 @@ #include "internal.h" -#ifndef CONFIG_CRYPTO_MANAGER_TESTS +#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS /* a perfect nop */ int alg_test(const char *driver, const char *alg, u32 type, u32 mask) @@ -2542,6 +2542,6 @@ non_fips_alg: return -EINVAL; } -#endif /* CONFIG_CRYPTO_MANAGER_TESTS */ +#endif /* CONFIG_CRYPTO_MANAGER_DISABLE_TESTS */ EXPORT_SYMBOL_GPL(alg_test); |