From 461ac9e7b3f23dbfa3e5ec704c1b4b5b50e271ee Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Nov 2012 23:42:09 +0100
Subject: [PATCH] --- yaml --- r: 344316 b: refs/heads/master c:
 74f980beaa660614c707675ce6a11e70db3d49b6 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/configs/mvebu_defconfig | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 673e6e10409a..e02ef51822da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 895e4e3a7da0fea246e736dd815b4d04851ea387
+refs/heads/master: 74f980beaa660614c707675ce6a11e70db3d49b6
diff --git a/trunk/arch/arm/configs/mvebu_defconfig b/trunk/arch/arm/configs/mvebu_defconfig
index cdec70600994..cc2c3b2e9641 100644
--- a/trunk/arch/arm/configs/mvebu_defconfig
+++ b/trunk/arch/arm/configs/mvebu_defconfig
@@ -19,16 +19,23 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
 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
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_USB_SUPPORT is not set
+CONFIG_DMADEVICES=y
+CONFIG_MV_XOR=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y