summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-armv76
-rw-r--r--config-armv7-generic2
-rw-r--r--config-armv7-lpae4
-rw-r--r--config-armv7-tegra3
-rw-r--r--kernel.spec3
5 files changed, 9 insertions, 9 deletions
diff --git a/config-armv7 b/config-armv7
index 6e34dec47..4f27e5c06 100644
--- a/config-armv7
+++ b/config-armv7
@@ -61,12 +61,9 @@ 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
-CONFIG_RTC_DRV_S35390A=y
+CONFIG_RTC_DRV_S35390A=m
CONFIG_RTC_DRV_88PM80X=m
CONFIG_RTC_DRV_MV=m
-CONFIG_MVMDIO=m
CONFIG_MVNETA=m
CONFIG_GPIO_MVEBU=y
CONFIG_MVEBU_CLK_CORE=y
@@ -450,7 +447,6 @@ CONFIG_REGULATOR_LP8755=m
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
# CONFIG_ARM_KPROBES_TEST is not set
-# CONFIG_LEDS_PWM is not set
# Defined config options we don't use yet
# CONFIG_PINCTRL_IMX35 is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index d6f2c84c0..4105483df 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -106,7 +106,6 @@ CONFIG_PM=y
CONFIG_PM_STD_PARTITION=""
CONFIG_SUSPEND=y
CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARM_CPU_TOPOLOGY=y
CONFIG_LOCAL_TIMERS=y
CONFIG_HW_PERF_EVENTS=y
@@ -367,6 +366,7 @@ CONFIG_TOUCHSCREEN_MC13783=m
CONFIG_TOUCHSCREEN_TSC2005=m
CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
CONFIG_BMP085_SPI=m
# Ethernet
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 9df571d55..15b0d53cd 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -56,6 +56,10 @@ CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+CONFIG_EXYNOS_VIDEO=y
+CONFIG_EXYNOS_MIPI_DSI=y
+CONFIG_EXYNOS_DP=y
+# CONFIG_EXYNOS_LCD_S6E8AX0 is not set
# CONFIG_DRM_EXYNOS is not set
CONFIG_DRM_EXYNOS_IOMMU=y
CONFIG_DRM_EXYNOS_DMABUF=y
diff --git a/config-armv7-tegra b/config-armv7-tegra
index 0058f0adb..20cda8a7b 100644
--- a/config-armv7-tegra
+++ b/config-armv7-tegra
@@ -21,9 +21,6 @@ CONFIG_MACH_TRIMSLICE=y
CONFIG_MACH_WARIO=y
CONFIG_MACH_VENTANA=y
-CONFIG_TEGRA_DEBUG_UARTD=y
-CONFIG_ARM_CPU_TOPOLOGY=y
-
CONFIG_TEGRA_PCI=y
CONFIG_TEGRA_IOMMU_GART=y
CONFIG_TEGRA_IOMMU_SMMU=y
diff --git a/kernel.spec b/kernel.spec
index 7fc4b6ee8..fbb7531bd 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2292,6 +2292,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Apr 22 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM updates
+
* Fri Apr 19 2013 Josh Boyer <jwboyer@redhat.com>
- Add patch to fix RCU splat from perf events