summaryrefslogtreecommitdiff
path: root/crypto/akcipher.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-12-02 09:33:25 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-12-02 09:33:25 -0800
commitef0902bd956672dc33d6f7dd7bcaff9f769ac5c3 (patch)
tree50a07d35f4a47620c4c611db434bf4fce05b9260 /crypto/akcipher.c
parent82d748eb43a673a56b639efd4d698e1e95715d82 (diff)
parentd3dd09594f91ee57e76cbc27023b214afa01a99a (diff)
downloadlinux-crypto-ef0902bd956672dc33d6f7dd7bcaff9f769ac5c3.tar.gz
linux-crypto-ef0902bd956672dc33d6f7dd7bcaff9f769ac5c3.zip
Merge tag 'v4.4-rc3' into next
Merge with Linux 4.4-rc3 to bring in helpers for multiu-driver modules.
Diffstat (limited to 'crypto/akcipher.c')
-rw-r--r--crypto/akcipher.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/akcipher.c b/crypto/akcipher.c
index 528ae6aa..120ec042 100644
--- a/crypto/akcipher.c
+++ b/crypto/akcipher.c
@@ -21,7 +21,6 @@
#include <linux/cryptouser.h>
#include <net/netlink.h>
#include <crypto/akcipher.h>
-#include <crypto/public_key.h>
#include "internal.h"
#ifdef CONFIG_NET