diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-01 17:58:18 (GMT) |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-01 17:58:18 (GMT) |
commit | 6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f (patch) | |
tree | f1324a39f155375221ed88db0626f61b75c51db6 /crypto/testmgr.c | |
parent | fec6dd833e733b5d9588a1f1e4d81118b79b5774 (diff) | |
parent | 76a6106f124e375df0ea6ba6bcf204b8caff786a (diff) | |
download | linux-6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f.tar.xz |
Merge branch 'for-2.6.37' into for-2.6.38
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); |