summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2012-11-21 20:00:36 +0000
committerJason Cooper <jason@lakedaemon.net>2012-11-21 20:00:36 +0000
commit9580e3e3fb44a5b7a1bfefccf4f03481cdbd3c5a (patch)
tree3fe6ef056f167c4502e2f6b7d193a63dc1a8c4f2 /arch/arm/configs
parent98d8df630d4a508f7d5f7d3bb4d78ca436ef1c8c (diff)
parent8dc40c19efad15f5bdb77b8d1ccf902902c00c58 (diff)
Merge tag 'marvell-net-xor-defconfig-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything
Marvell mvebu defconfig updates for 3.8 Conflicts: arch/arm/configs/mvebu_defconfig
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/mvebu_defconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index cdec70600994..cc2c3b2e9641 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/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