diff options
| author | Eric Rost <eric.rost@mybabylon.net> | 2014-10-24 17:32:53 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 16:39:58 +0800 |
| commit | c17cdeb41950a69d3e1f43b39a7e5e59ed59c8f9 (patch) | |
| tree | 8a84080c4e0dd3ee893076b9bd01981ec605dd55 /drivers/staging/skein | |
| parent | 24443a244b2ccac0883ddc3f929a8a6ea8457daa (diff) | |
staging: skein: Renames skein to skein_base
Renames skein.c to skein_base.c and skein.h to skein_base.h in
preparation for naming loadable module skein.ko
Signed-off-by: Eric Rost <eric.rost@mybabylon.net>
Reviewed-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/skein')
| -rw-r--r-- | drivers/staging/skein/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/skein/skein_api.h | 2 | ||||
| -rw-r--r-- | drivers/staging/skein/skein_base.c (renamed from drivers/staging/skein/skein.c) | 3 | ||||
| -rw-r--r-- | drivers/staging/skein/skein_base.h (renamed from drivers/staging/skein/skein.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/skein/skein_block.c | 2 | ||||
| -rw-r--r-- | drivers/staging/skein/skein_block.h | 2 | ||||
| -rw-r--r-- | drivers/staging/skein/skein_iv.h | 2 | ||||
| -rw-r--r-- | drivers/staging/skein/threefish_api.h | 2 |
8 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/skein/Makefile b/drivers/staging/skein/Makefile index 4b60171c81dd..ca746a9eb2ad 100644 --- a/drivers/staging/skein/Makefile +++ b/drivers/staging/skein/Makefile @@ -1,7 +1,7 @@ # # Makefile for the skein secure hash algorithm # -obj-$(CONFIG_CRYPTO_SKEIN) += skein.o \ +obj-$(CONFIG_CRYPTO_SKEIN) += skein_base.o \ skein_api.o \ skein_block.o \ threefish_block.o \ diff --git a/drivers/staging/skein/skein_api.h b/drivers/staging/skein/skein_api.h index e02fa19d9458..171b87549548 100644 --- a/drivers/staging/skein/skein_api.h +++ b/drivers/staging/skein/skein_api.h @@ -79,7 +79,7 @@ OTHER DEALINGS IN THE SOFTWARE. */ #include <linux/types.h> -#include "skein.h" +#include "skein_base.h" /** * Which Skein size to use diff --git a/drivers/staging/skein/skein.c b/drivers/staging/skein/skein_base.c index 8cc83587b1f1..e0994eae5b40 100644 --- a/drivers/staging/skein/skein.c +++ b/drivers/staging/skein/skein_base.c @@ -11,7 +11,8 @@ #define SKEIN_PORT_CODE /* instantiate any code in skein_port.h */ #include <linux/string.h> /* get the memcpy/memset functions */ -#include "skein.h" /* get the Skein API definitions */ +#include <linux/export.h> +#include "skein_base.h" /* get the Skein API definitions */ #include "skein_iv.h" /* get precomputed IVs */ #include "skein_block.h" diff --git a/drivers/staging/skein/skein.h b/drivers/staging/skein/skein_base.h index e6669f196e5d..e6669f196e5d 100644 --- a/drivers/staging/skein/skein.h +++ b/drivers/staging/skein/skein_base.h diff --git a/drivers/staging/skein/skein_block.c b/drivers/staging/skein/skein_block.c index 88bc718ae5b6..36b0b400acf3 100644 --- a/drivers/staging/skein/skein_block.c +++ b/drivers/staging/skein/skein_block.c @@ -15,7 +15,7 @@ ************************************************************************/ #include <linux/string.h> -#include "skein.h" +#include "skein_base.h" #include "skein_block.h" #ifndef SKEIN_USE_ASM diff --git a/drivers/staging/skein/skein_block.h b/drivers/staging/skein/skein_block.h index bd7bdc35df29..9d40f4a5267b 100644 --- a/drivers/staging/skein/skein_block.h +++ b/drivers/staging/skein/skein_block.h @@ -10,7 +10,7 @@ #ifndef _SKEIN_BLOCK_H_ #define _SKEIN_BLOCK_H_ -#include "skein.h" /* get the Skein API definitions */ +#include "skein_base.h" /* get the Skein API definitions */ void skein_256_process_block(struct skein_256_ctx *ctx, const u8 *blk_ptr, size_t blk_cnt, size_t byte_cnt_add); diff --git a/drivers/staging/skein/skein_iv.h b/drivers/staging/skein/skein_iv.h index d9dc1d5ed551..8a06314d0ed4 100644 --- a/drivers/staging/skein/skein_iv.h +++ b/drivers/staging/skein/skein_iv.h @@ -1,7 +1,7 @@ #ifndef _SKEIN_IV_H_ #define _SKEIN_IV_H_ -#include "skein.h" /* get Skein macros and types */ +#include "skein_base.h" /* get Skein macros and types */ /* ***************** Pre-computed Skein IVs ******************* diff --git a/drivers/staging/skein/threefish_api.h b/drivers/staging/skein/threefish_api.h index 8d5ddf8b3a9b..8e0a0b77ecce 100644 --- a/drivers/staging/skein/threefish_api.h +++ b/drivers/staging/skein/threefish_api.h @@ -29,7 +29,7 @@ */ #include <linux/types.h> -#include "skein.h" +#include "skein_base.h" #define KEY_SCHEDULE_CONST 0x1BD11BDAA9FC1A22L |