summaryrefslogtreecommitdiff
path: root/crypto/blkcipher.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2018-03-07 13:57:24 +0100
committerBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2018-03-07 13:57:24 +0100
commit249b6bae56fc18f4512fe5bc085f71cc235c0735 (patch)
tree89cf28b0e13c85f0a04d216121cbdafdf9668ba0 /crypto/blkcipher.c
parent59d9ddb192bc424cc53e52180478001af4fb99a4 (diff)
parentc7ee969dff58a7f5e447e27fe064e2d1ce81d574 (diff)
downloadlinux-crypto-249b6bae56fc18f4512fe5bc085f71cc235c0735.tar.gz
linux-crypto-249b6bae56fc18f4512fe5bc085f71cc235c0735.zip
Merge tag 'v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.16-rc4
Diffstat (limited to '')
-rw-r--r--crypto/blkcipher.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 6c43a0a1..01c0d4aa 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -18,7 +18,6 @@
#include <crypto/internal/skcipher.h>
#include <crypto/scatterwalk.h>
#include <linux/errno.h>
-#include <linux/hardirq.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/seq_file.h>