From dc4f4d024df64b95edf459590d8e7c0614947752 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Apr 22 2013 11:45:00 +0000
Subject: Minor ARM updates


---

diff --git a/config-armv7 b/config-armv7
index 6e34dec..4f27e5c 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 d6f2c84..4105483 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 9df571d..15b0d53 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 0058f0a..20cda8a 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 3ae5b81..415ea7c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2299,6 +2299,9 @@ fi
 # and build.
 
 %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