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

Pull "mvebu defconfig64 for 4.12 (part 1)" from Gregory CLEMENT:

Update arm64 defconfig by adding MVPP2 for Marvell Armada 7K/8K and
MVNETA and I2C_PXA for Armada 37xx.

* tag 'mvebu-defconfig64-4.12-1' of git://git.infradead.org/linux-mvebu:
  arm64: defconfig: enable MVPP2
  arm64: defconfig: enable I2C_PXA
  arm64: defconfig: enable MVNETA

diff --cc arch/arm64/configs/defconfig
index b653c4305922365629d6c364944fd7e8a33af09f,8e27221afded28d9d9d6e7488ded3eb7c3e239c7..fa9ee9e85e5efee5c557511236507971222d85eb
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -249,9 -251,9 +251,10 @@@ CONFIG_I2C_DESIGNWARE_PLATFORM=
  CONFIG_I2C_IMX=y
  CONFIG_I2C_MESON=y
  CONFIG_I2C_MV64XXX=y
+ CONFIG_I2C_PXA=y
  CONFIG_I2C_QUP=y
  CONFIG_I2C_RK3X=y
 +CONFIG_I2C_SH_MOBILE=y
  CONFIG_I2C_TEGRA=y
  CONFIG_I2C_UNIPHIER_F=y
  CONFIG_I2C_RCAR=y