aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/internal.h
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-25 13:21:06 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-25 13:21:06 +0100
commit81cf65ff6fa1af7199001a61ce126e57b64ce98a (patch)
tree71cce1dd8b8fd1e68ff8786dafd58fd2bec0b804 /crypto/internal.h
parent02352a56e21d0f215000c4cbb474c2cac5309661 (diff)
downloadkernel_samsung_smdk4412-81cf65ff6fa1af7199001a61ce126e57b64ce98a.zip
kernel_samsung_smdk4412-81cf65ff6fa1af7199001a61ce126e57b64ce98a.tar.gz
kernel_samsung_smdk4412-81cf65ff6fa1af7199001a61ce126e57b64ce98a.tar.bz2
crypto merged
Diffstat (limited to 'crypto/internal.h')
-rw-r--r--crypto/internal.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/crypto/internal.h b/crypto/internal.h
index 0e7e9fd..d4384b0 100644
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -51,14 +51,7 @@ extern struct rw_semaphore crypto_alg_sem;
extern struct blocking_notifier_head crypto_chain;
#ifdef CONFIG_PROC_FS
-#ifdef CONFIG_CRYPTO_FIPS
-void set_in_fips_err(void);
-void __init crypto_init_proc(int *fips_error);
-void do_integrity_check(void);
-int testmgr_crypto_proc_init(void);
-#else
void __init crypto_init_proc(void);
-#endif
void __exit crypto_exit_proc(void);
#else
static inline void crypto_init_proc(void)
@@ -145,3 +138,4 @@ static inline void crypto_notify(unsigned long val, void *v)
}
#endif /* _CRYPTO_INTERNAL_H */
+