Merge tag 'mvebu-defconfig64-4.12-2' of git://git.infradead.org/linux-mvebu into...

mvebu defconfig64 for 4.12 (part 2)

Select two new drivers  for ARM64 mvebu SoCs:
 - Xenon SDHCI controller on Armada 37xx and Armada 7K/8K
 - Safexcel crypto engine on Armada 7K/8K

* tag 'mvebu-defconfig64-4.12-2' of git://git.infradead.org/linux-mvebu:
  arm64: defconfig: enable the Safexcel crypto engine as a module
  arm64: configs: enable SDHCI driver for Xenon

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm64/configs/defconfig
index 56ae20067acf2ce6f632a71558b9dfb8ec0110a6,77eb1e448dc8d1f8b9c1e8bd9287fa0eaebbdf41..701b0ee36cf3eda5e9ac187ae7792502d2079f72
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -413,7 -401,7 +413,8 @@@ CONFIG_MMC_DW_EXYNOS=
  CONFIG_MMC_DW_K3=y
  CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_MMC_SUNXI=y
+ CONFIG_MMC_SDHCI_XENON=y
 +CONFIG_MMC_BCM2835=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_GPIO=y