diff --git a/config-arm-generic b/config-arm-generic
index ac77026..3a67e6e 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -255,6 +255,7 @@ CONFIG_HW_RANDOM_EXYNOS=m
 # Device tree
 CONFIG_OF=y
 CONFIG_USE_OF=y
+CONFIG_OF_DEVICE=y
 CONFIG_OF_IRQ=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_APPENDED_DTB=y
diff --git a/config-arm-tegra b/config-arm-tegra
index db1c031..b62bdec 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -1,9 +1,8 @@
 CONFIG_ARCH_TEGRA=y
 
 CONFIG_ARCH_TEGRA_2x_SOC=y
-# CONFIG_ARCH_TEGRA_3x_SOC is not set
+CONFIG_ARCH_TEGRA_3x_SOC=y
 # CONFIG_ARM_LPAE is not set
-CONFIG_TEGRA_PCI=y
 
 CONFIG_VFP=y
 CONFIG_VFPv3=y
@@ -20,6 +19,7 @@ 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
 
@@ -72,8 +72,8 @@ CONFIG_SND_SOC_TEGRA_ALC5632=m
 CONFIG_SND_SOC_TEGRA_WM8753=m
 CONFIG_SND_SOC_TEGRA_WM8903=m
 CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
-# CONFIG_SND_SOC_TEGRA30_AHUB is not set
-# CONFIG_SND_SOC_TEGRA30_I2S is not set
+CONFIG_SND_SOC_TEGRA30_AHUB=m
+CONFIG_SND_SOC_TEGRA30_I2S=m
 
 # AC100 (PAZ00)
 # CONFIG_MFD_NVEC is not set
diff --git a/config-armv7 b/config-armv7
index 30fde80..63b5987 100644
--- a/config-armv7
+++ b/config-armv7
@@ -74,8 +74,9 @@ CONFIG_ARM_ERRATA_754322=y
 CONFIG_ARM_ERRATA_754327=y
 CONFIG_ARM_ERRATA_764369=y
 CONFIG_ARM_ERRATA_775420=y
-CONFIG_PL310_ERRATA_588369=y
-CONFIG_PL310_ERRATA_727915=y
+# Disabled due to causing highbank to crash
+# CONFIG_PL310_ERRATA_588369 is not set
+# CONFIG_PL310_ERRATA_727915 is not set
 CONFIG_PL310_ERRATA_769419=y
 
 # generic that deviates from or should be merged into config-generic
@@ -172,7 +173,7 @@ CONFIG_FB_ARMCLCD=m
 CONFIG_I2C_VERSATILE=m
 CONFIG_OC_ETM=y
 CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
-# CONFIG_SENSORS_VEXPRESS is not set
+CONFIG_SENSORS_VEXPRESS=m
 
 # unknown and needs review
 CONFIG_ARM_AMBA=y
@@ -254,6 +255,7 @@ CONFIG_CRYPTO_DEV_PICOXCELL=m
 # Device tree
 CONFIG_OF=y
 CONFIG_USE_OF=y
+CONFIG_OF_DEVICE=y
 CONFIG_OF_IRQ=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_APPENDED_DTB=y
diff --git a/kernel.spec b/kernel.spec
index 33639e7..d409791 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2297,6 +2297,10 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Jan 18 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable problematic PL310 ARM errata
+- Minor ARM config tweaks
+
 * Wed Jan 16 2013 Josh Boyer <jwboyer@redhat.com>
 - Fix power management sysfs on non-secure boot machines (rhbz 896243)