diff options
author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-02-27 16:28:05 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 15:01:57 -0400 |
commit | 5c436fbef207e11aeae54ea6c8dfd4c65b2aaac2 (patch) | |
tree | fb1ff9a8413840b12347518c049e8f6416160d0c | |
parent | dbf9387c08a68634b8d350b3585f91eae1ed59e1 (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_defconfig | 4 |
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 | |||
12 | CONFIG_MACH_ARMADA_375=y | 12 | CONFIG_MACH_ARMADA_375=y |
13 | CONFIG_MACH_ARMADA_38X=y | 13 | CONFIG_MACH_ARMADA_38X=y |
14 | CONFIG_MACH_ARMADA_XP=y | 14 | CONFIG_MACH_ARMADA_XP=y |
15 | CONFIG_MACH_DOVE=y | ||
15 | CONFIG_ARCH_BCM=y | 16 | CONFIG_ARCH_BCM=y |
16 | CONFIG_ARCH_BCM_MOBILE=y | 17 | CONFIG_ARCH_BCM_MOBILE=y |
17 | CONFIG_ARCH_BERLIN=y | 18 | CONFIG_ARCH_BERLIN=y |
@@ -117,6 +118,7 @@ CONFIG_SATA_MV=y | |||
117 | CONFIG_NETDEVICES=y | 118 | CONFIG_NETDEVICES=y |
118 | CONFIG_SUN4I_EMAC=y | 119 | CONFIG_SUN4I_EMAC=y |
119 | CONFIG_NET_CALXEDA_XGMAC=y | 120 | CONFIG_NET_CALXEDA_XGMAC=y |
121 | CONFIG_MV643XX_ETH=y | ||
120 | CONFIG_MVNETA=y | 122 | CONFIG_MVNETA=y |
121 | CONFIG_KS8851=y | 123 | CONFIG_KS8851=y |
122 | CONFIG_R8169=y | 124 | CONFIG_R8169=y |
@@ -195,6 +197,7 @@ CONFIG_POWER_RESET_AS3722=y | |||
195 | CONFIG_POWER_RESET_GPIO=y | 197 | CONFIG_POWER_RESET_GPIO=y |
196 | CONFIG_SENSORS_LM90=y | 198 | CONFIG_SENSORS_LM90=y |
197 | CONFIG_THERMAL=y | 199 | CONFIG_THERMAL=y |
200 | CONFIG_DOVE_THERMAL=y | ||
198 | CONFIG_ARMADA_THERMAL=y | 201 | CONFIG_ARMADA_THERMAL=y |
199 | CONFIG_WATCHDOG=y | 202 | CONFIG_WATCHDOG=y |
200 | CONFIG_ORION_WATCHDOG=y | 203 | CONFIG_ORION_WATCHDOG=y |
@@ -264,6 +267,7 @@ CONFIG_MMC_ARMMMCI=y | |||
264 | CONFIG_MMC_SDHCI=y | 267 | CONFIG_MMC_SDHCI=y |
265 | CONFIG_MMC_SDHCI_ESDHC_IMX=y | 268 | CONFIG_MMC_SDHCI_ESDHC_IMX=y |
266 | CONFIG_MMC_SDHCI_TEGRA=y | 269 | CONFIG_MMC_SDHCI_TEGRA=y |
270 | CONFIG_MMC_SDHCI_DOVE=y | ||
267 | CONFIG_MMC_SDHCI_SPEAR=y | 271 | CONFIG_MMC_SDHCI_SPEAR=y |
268 | CONFIG_MMC_SDHCI_BCM_KONA=y | 272 | CONFIG_MMC_SDHCI_BCM_KONA=y |
269 | CONFIG_MMC_OMAP=y | 273 | CONFIG_MMC_OMAP=y |