aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2014-02-27 16:28:05 -0500
committerArnd Bergmann <arnd@arndb.de>2014-03-17 15:01:57 -0400
commit5c436fbef207e11aeae54ea6c8dfd4c65b2aaac2 (patch)
treefb1ff9a8413840b12347518c049e8f6416160d0c
parentdbf9387c08a68634b8d350b3585f91eae1ed59e1 (diff)
ARM: add Marvell Dove and some drivers to multi_v7 defconfig
With Marvell Dove now being part of the multi_v7 family, add some Dove specific drivers to multi_v7 defconfig. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/configs/multi_v7_defconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 64e850d4896c..835c788953d7 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -12,6 +12,7 @@ CONFIG_MACH_ARMADA_370=y
12CONFIG_MACH_ARMADA_375=y 12CONFIG_MACH_ARMADA_375=y
13CONFIG_MACH_ARMADA_38X=y 13CONFIG_MACH_ARMADA_38X=y
14CONFIG_MACH_ARMADA_XP=y 14CONFIG_MACH_ARMADA_XP=y
15CONFIG_MACH_DOVE=y
15CONFIG_ARCH_BCM=y 16CONFIG_ARCH_BCM=y
16CONFIG_ARCH_BCM_MOBILE=y 17CONFIG_ARCH_BCM_MOBILE=y
17CONFIG_ARCH_BERLIN=y 18CONFIG_ARCH_BERLIN=y
@@ -117,6 +118,7 @@ CONFIG_SATA_MV=y
117CONFIG_NETDEVICES=y 118CONFIG_NETDEVICES=y
118CONFIG_SUN4I_EMAC=y 119CONFIG_SUN4I_EMAC=y
119CONFIG_NET_CALXEDA_XGMAC=y 120CONFIG_NET_CALXEDA_XGMAC=y
121CONFIG_MV643XX_ETH=y
120CONFIG_MVNETA=y 122CONFIG_MVNETA=y
121CONFIG_KS8851=y 123CONFIG_KS8851=y
122CONFIG_R8169=y 124CONFIG_R8169=y
@@ -195,6 +197,7 @@ CONFIG_POWER_RESET_AS3722=y
195CONFIG_POWER_RESET_GPIO=y 197CONFIG_POWER_RESET_GPIO=y
196CONFIG_SENSORS_LM90=y 198CONFIG_SENSORS_LM90=y
197CONFIG_THERMAL=y 199CONFIG_THERMAL=y
200CONFIG_DOVE_THERMAL=y
198CONFIG_ARMADA_THERMAL=y 201CONFIG_ARMADA_THERMAL=y
199CONFIG_WATCHDOG=y 202CONFIG_WATCHDOG=y
200CONFIG_ORION_WATCHDOG=y 203CONFIG_ORION_WATCHDOG=y
@@ -264,6 +267,7 @@ CONFIG_MMC_ARMMMCI=y
264CONFIG_MMC_SDHCI=y 267CONFIG_MMC_SDHCI=y
265CONFIG_MMC_SDHCI_ESDHC_IMX=y 268CONFIG_MMC_SDHCI_ESDHC_IMX=y
266CONFIG_MMC_SDHCI_TEGRA=y 269CONFIG_MMC_SDHCI_TEGRA=y
270CONFIG_MMC_SDHCI_DOVE=y
267CONFIG_MMC_SDHCI_SPEAR=y 271CONFIG_MMC_SDHCI_SPEAR=y
268CONFIG_MMC_SDHCI_BCM_KONA=y 272CONFIG_MMC_SDHCI_BCM_KONA=y
269CONFIG_MMC_OMAP=y 273CONFIG_MMC_OMAP=y