diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-07 12:27:23 -0800 | 
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-07 12:27:23 -0800 | 
| commit | d30cc16c8e48368e0518f4975a78711e53e14a0f (patch) | |
| tree | 26b57f7ab5a963cc3d6c57dff6951bd930875583 /include/linux/crypto.h | |
| parent | 41eb2d813f558900884e240c2f723e36c7bd151f (diff) | |
| parent | a1bcc1dcef8451b4291ea2a1b2677cb194102952 (diff) | |
| download | olio-linux-3.10-d30cc16c8e48368e0518f4975a78711e53e14a0f.tar.xz olio-linux-3.10-d30cc16c8e48368e0518f4975a78711e53e14a0f.zip  | |
Merge branch 'fixes-modulesplit' into fixes
Diffstat (limited to 'include/linux/crypto.h')
| -rw-r--r-- | include/linux/crypto.h | 6 | 
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index de9adec5693..8a94217b298 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -18,7 +18,6 @@  #define _LINUX_CRYPTO_H  #include <linux/atomic.h> -#include <linux/module.h>  #include <linux/kernel.h>  #include <linux/list.h>  #include <linux/slab.h> @@ -510,11 +509,6 @@ static inline int crypto_tfm_alg_priority(struct crypto_tfm *tfm)  	return tfm->__crt_alg->cra_priority;  } -static inline const char *crypto_tfm_alg_modname(struct crypto_tfm *tfm) -{ -	return module_name(tfm->__crt_alg->cra_module); -} -  static inline u32 crypto_tfm_alg_type(struct crypto_tfm *tfm)  {  	return tfm->__crt_alg->cra_flags & CRYPTO_ALG_TYPE_MASK;  |