Merge tag 'marvell-net-xor-defconfig-for-3.8' of github.com:MISL-EBU-System-SW/mainli...

Marvell mvebu defconfig updates for 3.8

Conflicts:
	arch/arm/configs/mvebu_defconfig

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --cc arch/arm/configs/mvebu_defconfig
index cdec706009946a0be6e245e36e1e0643ef77b723,58f3537466fcb2f8ea9d98a2df7812dc98729f0f..cc2c3b2e96418be96f887fca42089300dff8bb55
--- 1/arch/arm/configs/mvebu_defconfig
--- 2/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@@ -19,10 -19,12 +19,15 @@@ CONFIG_ZBOOT_ROM_TEXT=0x
  CONFIG_ZBOOT_ROM_BSS=0x0
  CONFIG_ARM_APPENDED_DTB=y
  CONFIG_VFP=y
+ CONFIG_NET=y
+ CONFIG_INET=y
  CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 +CONFIG_BLK_DEV_SD=y
 +CONFIG_ATA=y
 +CONFIG_SATA_MV=y
+ CONFIG_NETDEVICES=y
+ CONFIG_MVNETA=y
+ CONFIG_MARVELL_PHY=y
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_8250_CONSOLE=y
  CONFIG_SERIAL_OF_PLATFORM=y