From 1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Fri, 18 Mar 2016 09:54:47 -0400 Subject: Linux v4.5-3654-g5cd0911a9e0e - Fix oops from tsc subsystem (rhbz 1318596) - crypto, security, docs, rproc, dmaengine, powersupply, hsi, vfio, driver-core, tty, char, usb, configfs, ext4, dlm, gfs2, pstore merges --- Initial-AllWinner-A64-and-PINE64-support.patch | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'Initial-AllWinner-A64-and-PINE64-support.patch') diff --git a/Initial-AllWinner-A64-and-PINE64-support.patch b/Initial-AllWinner-A64-and-PINE64-support.patch index b86e2a6ee..7be47d850 100644 --- a/Initial-AllWinner-A64-and-PINE64-support.patch +++ b/Initial-AllWinner-A64-and-PINE64-support.patch @@ -1195,19 +1195,6 @@ index 5ba2188..ca59458 100644 }; static const struct factors_data sun5i_a13_ahb_data __initconst = { -diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig -index 07d4942..737200f 100644 ---- a/drivers/crypto/Kconfig -+++ b/drivers/crypto/Kconfig -@@ -487,7 +487,7 @@ config CRYPTO_DEV_IMGTEC_HASH - - config CRYPTO_DEV_SUN4I_SS - tristate "Support for Allwinner Security System cryptographic accelerator" -- depends on ARCH_SUNXI -+ depends on ARCH_SUNXI && !64BIT - select CRYPTO_MD5 - select CRYPTO_SHA1 - select CRYPTO_AES -- 2.5.0 -- cgit