From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Nov 2012 22:42:09 +0000 (+0100)
Subject: Merge tag 'marvell-net-xor-defconfig-for-3.8' of github.com:MISL-EBU-System-SW/mainli... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=74f980beaa660614c707675ce6a11e70db3d49b6;p=linux-beck.git

Merge tag 'marvell-net-xor-defconfig-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge

Marvell mvebu defconfig updates for 3.8

Conflicts:
	arch/arm/configs/mvebu_defconfig

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

74f980beaa660614c707675ce6a11e70db3d49b6
diff --cc arch/arm/configs/mvebu_defconfig
index cdec70600994,58f3537466fc..cc2c3b2e9641
--- a/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