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

Merge "ARM: mvebu: defconfig changes for v3.17 (round 2)" from Jason Cooper:

"Here's all the defconfig changes we have for mvebu this time around. The
big one is the removal of kirkwood_defconfig, corresponding to the
mach-kirkwood/ removal in mvebu/soc."

 - mvebu
   * Add appended_dtb support
   * Add devtmpfs support
   * Add 375 network driver
   * Add cpuidle support
   * Add cpufreq support

 - kirkwood
   * Remove kirkwood_defconfig

* tag 'mvebu-defconfig-3.17-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: update mvebu_v7_defconfig with cpufreq support
  ARM: mvebu: defconfig: enable cpuidle support in mvebu_v7_defconfig
  ARM: Kirkwood: Remove kirkwood_defconfig
  ARM: mvebu: enable Armada 375 network driver in mvebu_v7_defconfig
  ARM: mvebu: add devtmpfs to mvebu_v5_defconfig
  ARM: mvebu: add appended DTB support in mvebu_v5_defconfig

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

diff --combined arch/arm/configs/mvebu_v7_defconfig
index b0bfefa,fa04841..fdfda1f
--- 1/arch/arm/configs/mvebu_v7_defconfig
--- 2/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@@ -14,7 -14,6 +14,7 @@@ CONFIG_MACH_ARMADA_370=
  CONFIG_MACH_ARMADA_375=y
  CONFIG_MACH_ARMADA_38X=y
  CONFIG_MACH_ARMADA_XP=y
 +CONFIG_MACH_DOVE=y
  CONFIG_NEON=y
  # CONFIG_CACHE_L2X0 is not set
  # CONFIG_SWP_EMULATE is not set
@@@ -29,6 -28,10 +29,10 @@@ CONFIG_ZBOOT_ROM_TEXT=0x
  CONFIG_ZBOOT_ROM_BSS=0x0
  CONFIG_ARM_APPENDED_DTB=y
  CONFIG_ARM_ATAG_DTB_COMPAT=y
+ CONFIG_CPU_IDLE=y
+ CONFIG_ARM_MVEBU_V7_CPUIDLE=y
+ CONFIG_CPU_FREQ=y
+ CONFIG_CPUFREQ_GENERIC=y
  CONFIG_VFP=y
  CONFIG_NET=y
  CONFIG_INET=y
@@@ -46,6 -49,7 +50,7 @@@ CONFIG_AHCI_MVEBU=
  CONFIG_SATA_MV=y
  CONFIG_NETDEVICES=y
  CONFIG_MVNETA=y
+ CONFIG_MVPP2=y
  CONFIG_MARVELL_PHY=y
  CONFIG_MWIFIEX=y
  CONFIG_MWIFIEX_SDIO=y
@@@ -53,7 -57,6 +58,7 @@@ CONFIG_INPUT_EVDEV=
  CONFIG_KEYBOARD_GPIO=y
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
 +CONFIG_SERIAL_OF_PLATFORM=y
  CONFIG_I2C=y
  CONFIG_SPI=y
  CONFIG_SPI_ORION=y