diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 17:42:09 -0500 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 17:42:09 -0500 |
commit | 74f980beaa660614c707675ce6a11e70db3d49b6 (patch) | |
tree | 1850743db35687b9015d775c8fd494e60dee86fc /arch | |
parent | 895e4e3a7da0fea246e736dd815b4d04851ea387 (diff) | |
parent | 8dc40c19efad15f5bdb77b8d1ccf902902c00c58 (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/mvebu_defconfig | 7 |
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 | |||
19 | CONFIG_ZBOOT_ROM_BSS=0x0 | 19 | CONFIG_ZBOOT_ROM_BSS=0x0 |
20 | CONFIG_ARM_APPENDED_DTB=y | 20 | CONFIG_ARM_APPENDED_DTB=y |
21 | CONFIG_VFP=y | 21 | CONFIG_VFP=y |
22 | CONFIG_NET=y | ||
23 | CONFIG_INET=y | ||
22 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 24 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
23 | CONFIG_BLK_DEV_SD=y | 25 | CONFIG_BLK_DEV_SD=y |
24 | CONFIG_ATA=y | 26 | CONFIG_ATA=y |
25 | CONFIG_SATA_MV=y | 27 | CONFIG_SATA_MV=y |
28 | CONFIG_NETDEVICES=y | ||
29 | CONFIG_MVNETA=y | ||
30 | CONFIG_MARVELL_PHY=y | ||
26 | CONFIG_SERIAL_8250=y | 31 | CONFIG_SERIAL_8250=y |
27 | CONFIG_SERIAL_8250_CONSOLE=y | 32 | CONFIG_SERIAL_8250_CONSOLE=y |
28 | CONFIG_SERIAL_OF_PLATFORM=y | 33 | CONFIG_SERIAL_OF_PLATFORM=y |
29 | CONFIG_GPIOLIB=y | 34 | CONFIG_GPIOLIB=y |
30 | CONFIG_GPIO_SYSFS=y | 35 | CONFIG_GPIO_SYSFS=y |
31 | # CONFIG_USB_SUPPORT is not set | 36 | # CONFIG_USB_SUPPORT is not set |
37 | CONFIG_DMADEVICES=y | ||
38 | CONFIG_MV_XOR=y | ||
32 | # CONFIG_IOMMU_SUPPORT is not set | 39 | # CONFIG_IOMMU_SUPPORT is not set |
33 | CONFIG_EXT2_FS=y | 40 | CONFIG_EXT2_FS=y |
34 | CONFIG_EXT3_FS=y | 41 | CONFIG_EXT3_FS=y |