summaryrefslogtreecommitdiffstats
path: root/drivers/staging/skein/Makefile
diff options
context:
space:
mode:
authorEric Rost <eric.rost@mybabylon.net>2014-10-24 17:29:34 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-29 16:39:58 +0800
commit24443a244b2ccac0883ddc3f929a8a6ea8457daa (patch)
tree4a3b901c6370e2d4a23332e7d973a9b29c018677 /drivers/staging/skein/Makefile
parent828ebb8f82d9117762ebc22c6bc0b21d68301d44 (diff)
downloadop-kernel-dev-24443a244b2ccac0883ddc3f929a8a6ea8457daa.zip
op-kernel-dev-24443a244b2ccac0883ddc3f929a8a6ea8457daa.tar.gz
staging: skein: Collapses threefish module
Collapses threefish module into skein module. 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/Makefile')
-rw-r--r--drivers/staging/skein/Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/skein/Makefile b/drivers/staging/skein/Makefile
index a14aadd..4b60171 100644
--- a/drivers/staging/skein/Makefile
+++ b/drivers/staging/skein/Makefile
@@ -1,9 +1,8 @@
#
# Makefile for the skein secure hash algorithm
#
-obj-$(CONFIG_CRYPTO_SKEIN) += skein.o \
- skein_api.o \
- skein_block.o
-
-obj-$(CONFIG_CRYPTO_THREEFISH) += threefish_block.o \
- threefish_api.o
+obj-$(CONFIG_CRYPTO_SKEIN) += skein.o \
+ skein_api.o \
+ skein_block.o \
+ threefish_block.o \
+ threefish_api.o
OpenPOWER on IntegriCloud