From ff5c3fda70b411309bc6589bfd2911e1d0c34c4f Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Sun, 9 Jul 2006 10:35:49 +1000 Subject: [PATCH] --- yaml --- r: 34215 b: refs/heads/master c: db5e9a42373ae6d84c4b0179c2fe0aba866474e8 h: refs/heads/master i: 34213: fc0b3e73131d1fc786d440587db5f2a96739f4eb 34211: a32116064afd3fef4accdb8e11e6a990280ffa6e 34207: e2216784d2f2c2f941e294644c6c703197888a8c v: v3 --- [refs] | 2 +- trunk/drivers/crypto/padlock-aes.c | 3 +++ trunk/drivers/crypto/padlock.h | 5 ----- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9bd7c744b468..05d38b111ee4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1191f0a49390caf16f4a2831a4fc373757471ad6 +refs/heads/master: db5e9a42373ae6d84c4b0179c2fe0aba866474e8 diff --git a/trunk/drivers/crypto/padlock-aes.c b/trunk/drivers/crypto/padlock-aes.c index ee33bd6c1b77..241052da2787 100644 --- a/trunk/drivers/crypto/padlock-aes.c +++ b/trunk/drivers/crypto/padlock-aes.c @@ -533,3 +533,6 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Michal Ludvig"); MODULE_ALIAS("aes-padlock"); + +/* This module used to be called padlock. */ +MODULE_ALIAS("padlock"); diff --git a/trunk/drivers/crypto/padlock.h b/trunk/drivers/crypto/padlock.h index b78489bc298a..e2ee3b689dbd 100644 --- a/trunk/drivers/crypto/padlock.h +++ b/trunk/drivers/crypto/padlock.h @@ -28,9 +28,4 @@ struct cword { #define PFX "padlock: " -#ifdef CONFIG_CRYPTO_DEV_PADLOCK_AES -int padlock_init_aes(void); -void padlock_fini_aes(void); -#endif - #endif /* _CRYPTO_PADLOCK_H */