diff --git a/config-armv7 b/config-armv7
index 7eed946fd..857e217ed 100644
--- a/config-armv7
+++ b/config-armv7
@@ -11,10 +11,10 @@ CONFIG_ARCH_SOCFPGA=y
 # CONFIG_PLAT_SPEAR is not set
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_TEGRA=y
-CONFIG_ARCH_U8500=y
+# CONFIG_ARCH_U8500 is not set
 CONFIG_ARCH_VEXPRESS_CA9X4=y
 CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_VIRT=y
+# CONFIG_ARCH_VIRT is not set
 # CONFIG_ARCH_WM8850 is not set
 CONFIG_ARCH_ZYNQ=y
 
diff --git a/config-armv7-generic b/config-armv7-generic
index fea4872c5..5e7e97884 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -39,8 +39,6 @@ CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
 
 # CONFIG_MCPM is not set
 # CONFIG_OABI_COMPAT is not set
-# CONFIG_FPE_NWFPE is not set
-# CONFIG_FPE_FASTFPE is not set
 # CONFIG_APM_EMULATION is not set
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
@@ -57,8 +55,9 @@ CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y
 # CONFIG_ARM_ERRATA_411920 is not set
 # Cortex-A8
 CONFIG_ARM_ERRATA_430973=y
-CONFIG_ARM_ERRATA_458693=y
-CONFIG_ARM_ERRATA_460075=y
+# The following two don't work with MP
+# CONFIG_ARM_ERRATA_458693 is not set
+# CONFIG_ARM_ERRATA_460075 is not set
 # Cortex-A9
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_ARM_ERRATA_742230=y
diff --git a/kernel.spec b/kernel.spec
index fc2a5d0f0..38a38733d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2238,6 +2238,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Jun  3 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM config changes
+
 * Sun Jun  2 2013 Peter Robinson <pbrobinson@fedoraproject.org>
 - Add patch to fix DRM/X on omap (panda)
 - Enable Cortex-A8 errata on multiplatform kernels (omap3)