fix warning (due to an error during manual conflict resolution)

diff --git a/crypto/crypto.h b/crypto/crypto.h
index 52694ebffa1ad5ae623f30a027b34630fcd479c9..208ce5f7c11a9a3df369f47b46c99219d99a8de1 100644 (file)
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -123,7 +123,6 @@ extern "C" {
 #define        CRYPTO_LOCK_MALLOC2             26
 #define        CRYPTO_LOCK_DSO                 27
 #define        CRYPTO_LOCK_DYNLOCK             28
-#define        CRYPTO_NUM_LOCKS                29
 #define        CRYPTO_LOCK_ENGINE              29
 #define        CRYPTO_NUM_LOCKS                30