From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 25 Apr 2016 19:10:07 +0000 (+0200)
Subject: Merge tag 'mvebu-defconfig-4.7-1' of git://git.infradead.org/linux-mvebu into next... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dbb2bc9118da94ba261278068af300ad3e71efc8;p=linux-beck.git

Merge tag 'mvebu-defconfig-4.7-1' of git://git.infradead.org/linux-mvebu into next/defconfig

Merge "mvebu defconfig for 4.7 (part 1)" from Gregory CLEMENT

- Use the new cryto engine(mv_cesa) in the mvebu and multi-arm
  defcongig files
- Attach mvebu_*_defconfig to the mvebu maintainers

* tag 'mvebu-defconfig-4.7-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu_v5_defconfig: Switching to the new Marvell's cryptographic engine driver
  ARM: multi_v7_defconfig: Enabling the new Marvell's cryptographic engine driver
  MAINTAINERS: attach arch/arm/configs/mvebu_*_defconfig to relevant maintainers
  ARM: mvebu_v7_defconfig: Enabling the new Marvell's cryptographic engine driver
---

dbb2bc9118da94ba261278068af300ad3e71efc8
diff --cc arch/arm/configs/multi_v7_defconfig
index edf78515d478,392e970b60c7..e80662b73254
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -841,8 -829,7 +841,9 @@@ CONFIG_LOCKUP_DETECTOR=
  CONFIG_CRYPTO_DEV_TEGRA_AES=y
  CONFIG_CPUFREQ_DT=y
  CONFIG_KEYSTONE_IRQ=y
 +CONFIG_HW_RANDOM=y
 +CONFIG_HW_RANDOM_ST=y
+ CONFIG_CRYPTO_DEV_MARVELL_CESA=m
  CONFIG_CRYPTO_DEV_SUN4I_SS=m
  CONFIG_CRYPTO_DEV_ROCKCHIP=m
  CONFIG_ARM_CRYPTO=y