summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-arm-tegra3
-rw-r--r--config-armv77
-rw-r--r--kernel.spec3
3 files changed, 13 insertions, 0 deletions
diff --git a/config-arm-tegra b/config-arm-tegra
index 1738aedb9..db1c031e0 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -85,6 +85,9 @@ CONFIG_POWER_SUPPLY=y
CONFIG_NVEC_LEDS=y
CONFIG_NVEC_PAZ00=y
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_RTC_DRV_TPS6586X is not set
+
CONFIG_PWM_TEGRA=m
CONFIG_DRM_TEGRA=m
diff --git a/config-armv7 b/config-armv7
index 2ff23c17a..30fde8064 100644
--- a/config-armv7
+++ b/config-armv7
@@ -184,7 +184,14 @@ CONFIG_CRYPTO_DEV_MV_CESA=m
CONFIG_MV643XX_ETH=m
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_MVNETA=m
+CONFIG_SATA_MV=m
+CONFIG_MARVELL_PHY=m
+CONFIG_RTC_DRV_S35390A=y
# Allwinner a1x
# CONFIG_SUNXI_RFKILL=y
diff --git a/kernel.spec b/kernel.spec
index 46c65a46b..18fe93b7f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2306,6 +2306,9 @@ fi
# ||----w |
# || ||
%changelog
+* Wed Jan 9 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Update ARM mvebu config
+
* Wed Jan 09 2013 Josh Boyer <jwboyer@redhat.com>
- Enable CONFIG_CIFS_DEBUG as it was on before it was split out