aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/configs/multi_v5_defconfig2
-rw-r--r--arch/arm/configs/mvebu_v5_defconfig2
-rw-r--r--arch/arm/configs/mvebu_v7_defconfig6
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index 018bef9fa7e8..9d56781a8f80 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -67,9 +67,11 @@ CONFIG_SATA_AHCI=y
67CONFIG_SATA_MV=y 67CONFIG_SATA_MV=y
68CONFIG_NETDEVICES=y 68CONFIG_NETDEVICES=y
69CONFIG_NET_DSA_MV88E6123_61_65=y 69CONFIG_NET_DSA_MV88E6123_61_65=y
70CONFIG_NET_DSA_MV88E6171=y
70CONFIG_MV643XX_ETH=y 71CONFIG_MV643XX_ETH=y
71CONFIG_R8169=y 72CONFIG_R8169=y
72CONFIG_MARVELL_PHY=y 73CONFIG_MARVELL_PHY=y
74CONFIG_MWL8K=m
73CONFIG_LIBERTAS=y 75CONFIG_LIBERTAS=y
74CONFIG_LIBERTAS_SDIO=y 76CONFIG_LIBERTAS_SDIO=y
75CONFIG_INPUT_EVDEV=y 77CONFIG_INPUT_EVDEV=y
diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig
index 22058e18dfaa..824de499237b 100644
--- a/arch/arm/configs/mvebu_v5_defconfig
+++ b/arch/arm/configs/mvebu_v5_defconfig
@@ -67,9 +67,11 @@ CONFIG_SATA_AHCI=y
67CONFIG_SATA_MV=y 67CONFIG_SATA_MV=y
68CONFIG_NETDEVICES=y 68CONFIG_NETDEVICES=y
69CONFIG_NET_DSA_MV88E6123_61_65=y 69CONFIG_NET_DSA_MV88E6123_61_65=y
70CONFIG_NET_DSA_MV88E6171=y
70CONFIG_MV643XX_ETH=y 71CONFIG_MV643XX_ETH=y
71CONFIG_R8169=y 72CONFIG_R8169=y
72CONFIG_MARVELL_PHY=y 73CONFIG_MARVELL_PHY=y
74CONFIG_MWL8K=m
73CONFIG_LIBERTAS=y 75CONFIG_LIBERTAS=y
74CONFIG_LIBERTAS_SDIO=y 76CONFIG_LIBERTAS_SDIO=y
75CONFIG_INPUT_EVDEV=y 77CONFIG_INPUT_EVDEV=y
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index ed0a0d1be0f3..9ca7e7822288 100644
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -59,10 +59,12 @@ CONFIG_ATA=y
59CONFIG_AHCI_MVEBU=y 59CONFIG_AHCI_MVEBU=y
60CONFIG_SATA_MV=y 60CONFIG_SATA_MV=y
61CONFIG_NETDEVICES=y 61CONFIG_NETDEVICES=y
62CONFIG_NET_DSA_MV88E6171=y
62CONFIG_MV643XX_ETH=y 63CONFIG_MV643XX_ETH=y
63CONFIG_MVNETA=y 64CONFIG_MVNETA=y
64CONFIG_MVPP2=y 65CONFIG_MVPP2=y
65CONFIG_MARVELL_PHY=y 66CONFIG_MARVELL_PHY=y
67CONFIG_FIXED_PHY=y
66CONFIG_MWIFIEX=y 68CONFIG_MWIFIEX=y
67CONFIG_MWIFIEX_SDIO=y 69CONFIG_MWIFIEX_SDIO=y
68CONFIG_INPUT_EVDEV=y 70CONFIG_INPUT_EVDEV=y
@@ -85,7 +87,9 @@ CONFIG_SOUND=y
85CONFIG_SND=y 87CONFIG_SND=y
86CONFIG_SND_SOC=y 88CONFIG_SND_SOC=y
87CONFIG_SND_KIRKWOOD_SOC=y 89CONFIG_SND_KIRKWOOD_SOC=y
88CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=y 90CONFIG_SND_SOC_CS42L51_I2C=y
91CONFIG_SND_SOC_SPDIF=y
92CONFIG_SND_SIMPLE_CARD=y
89CONFIG_USB=y 93CONFIG_USB=y
90CONFIG_USB_XHCI_HCD=y 94CONFIG_USB_XHCI_HCD=y
91CONFIG_USB_XHCI_MVEBU=y 95CONFIG_USB_XHCI_MVEBU=y