From d84ad0cc564383e2a77a8f775ef96a8c058d6307 Mon Sep 17 00:00:00 2001
From: Sebastian Siewior <sebastian@breakpoint.cc>
Date: Sun, 30 Mar 2008 16:36:09 +0800
Subject: [PATCH] --- yaml --- r: 91653 b: refs/heads/master c:
 c3715cb90f722b1cf5f6f073be02cc8a49659b90 h: refs/heads/master i:   91651:
 22a58fc9caee706e60356402c5242d517556a250 v: v3

---
 [refs]                       | 2 +-
 trunk/crypto/Kconfig         | 2 +-
 trunk/crypto/Makefile        | 3 ++-
 trunk/crypto/api.c           | 3 +++
 trunk/include/linux/crypto.h | 7 -------
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 4a3ee634d79e..6c9fd2d33dc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76cb9521795a167ae3d206343c072f602d84f815
+refs/heads/master: c3715cb90f722b1cf5f6f073be02cc8a49659b90
diff --git a/trunk/crypto/Kconfig b/trunk/crypto/Kconfig
index e14ff1275018..edd00c5307a4 100644
--- a/trunk/crypto/Kconfig
+++ b/trunk/crypto/Kconfig
@@ -13,7 +13,7 @@ source "crypto/async_tx/Kconfig"
 # Cryptographic API Configuration
 #
 menuconfig CRYPTO
-	bool "Cryptographic API"
+	tristate "Cryptographic API"
 	help
 	  This option provides the core Cryptographic API.
 
diff --git a/trunk/crypto/Makefile b/trunk/crypto/Makefile
index 6d34bf7ecf8d..ca024418f4fb 100644
--- a/trunk/crypto/Makefile
+++ b/trunk/crypto/Makefile
@@ -2,7 +2,8 @@
 # Cryptographic API
 #
 
-obj-$(CONFIG_CRYPTO) += api.o cipher.o digest.o compress.o
+obj-$(CONFIG_CRYPTO) += crypto.o
+crypto-objs := api.o cipher.o digest.o compress.o
 
 crypto_algapi-$(CONFIG_PROC_FS) += proc.o
 crypto_algapi-objs := algapi.o scatterwalk.o $(crypto_algapi-y)
diff --git a/trunk/crypto/api.c b/trunk/crypto/api.c
index a2496d1bc6d4..0a0f41ef255f 100644
--- a/trunk/crypto/api.c
+++ b/trunk/crypto/api.c
@@ -445,3 +445,6 @@ int crypto_has_alg(const char *name, u32 type, u32 mask)
 	return ret;
 }
 EXPORT_SYMBOL_GPL(crypto_has_alg);
+
+MODULE_DESCRIPTION("Cryptographic core API");
+MODULE_LICENSE("GPL");
diff --git a/trunk/include/linux/crypto.h b/trunk/include/linux/crypto.h
index 5e02d1b46370..425824bd49f3 100644
--- a/trunk/include/linux/crypto.h
+++ b/trunk/include/linux/crypto.h
@@ -317,14 +317,7 @@ int crypto_unregister_alg(struct crypto_alg *alg);
 /*
  * Algorithm query interface.
  */
-#ifdef CONFIG_CRYPTO
 int crypto_has_alg(const char *name, u32 type, u32 mask);
-#else
-static inline int crypto_has_alg(const char *name, u32 type, u32 mask)
-{
-	return 0;
-}
-#endif
 
 /*
  * Transforms: user-instantiated objects which encapsulate algorithms