From d70d5dbf6eb5fd1df50ba3fafd5af3dec378cffc Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 23 Mar 2013 18:39:43 +0000 Subject: [PATCH] Disable Marvell Dove support for the moment as it breaks other SoCs --- config-armv7 | 6 ------ kernel.spec | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/config-armv7 b/config-armv7 index 8eb6dafa4..eea4d33ff 100644 --- a/config-armv7 +++ b/config-armv7 @@ -190,10 +190,6 @@ CONFIG_ARM_AMBA=y CONFIG_MACH_ARMADA_370_XP=y CONFIG_MACH_ARMADA_370=y CONFIG_MACH_ARMADA_XP=y -CONFIG_ARCH_DOVE=y -# CONFIG_MACH_DOVE_DB is not set -# CONFIG_MACH_CM_A510 is not set -CONFIG_MACH_DOVE_DT=y CONFIG_CACHE_TAUROS2=y CONFIG_MV_XOR=y @@ -203,7 +199,6 @@ CONFIG_I2C_MV64XXX=m CONFIG_PINCTRL_MVEBU=y CONFIG_PINCTRL_ARMADA_370=y CONFIG_PINCTRL_ARMADA_XP=y -CONFIG_PINCTRL_DOVE=y CONFIG_EDAC_MV64X60=m CONFIG_SATA_MV=m CONFIG_MARVELL_PHY=m @@ -215,7 +210,6 @@ CONFIG_MVNETA=m CONFIG_GPIO_MVEBU=y CONFIG_MVEBU_CLK_CORE=y CONFIG_MVEBU_CLK_GATING=y -CONFIG_MMC_SDHCI_DOVE=m # Allwinner a1x # CONFIG_SUNXI_RFKILL=y diff --git a/kernel.spec b/kernel.spec index 7118f86d4..0c28e5045 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2391,6 +2391,9 @@ fi # ||----w | # || || %changelog +* Sat Mar 23 2013 Peter Robinson +- Disable Marvell Dove support for the moment as it breaks other SoCs + * Thu Mar 21 2013 Josh Boyer - Fix workqueue crash in mac80211 (rhbz 920218)