diff options
author | Dennis Gilmore <dennis@ausil.us> | 2011-12-23 10:28:07 -0600 |
---|---|---|
committer | Dennis Gilmore <dennis@ausil.us> | 2011-12-23 10:28:48 -0600 |
commit | 1cbcbe6c389c712d7368ba171bd0b00fe8e32819 (patch) | |
tree | 1ada80657844e6afa7e08fbf12f0bb23f6c88b82 /config-arm-tegra | |
parent | 534352f358b444bf67c24181516d90d4ca59ed46 (diff) | |
download | kernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.tar.gz kernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.tar.xz kernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.zip |
pull in the arm config changes from f15
Diffstat (limited to 'config-arm-tegra')
-rw-r--r-- | config-arm-tegra | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config-arm-tegra b/config-arm-tegra index 0f9d0f0ff..b131978d2 100644 --- a/config-arm-tegra +++ b/config-arm-tegra @@ -5,7 +5,6 @@ CONFIG_MACH_PAZ00=y CONFIG_MACH_TRIMSLICE=y CONFIG_MACH_WARIO=y CONFIG_MACH_TEGRA_DT=y -CONFIG_MACH_VENTANA=y CONFIG_TEGRA_DEBUG_UARTD=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y @@ -35,6 +34,7 @@ CONFIG_ARM_ERRATA_430973=y CONFIG_ARM_ERRATA_742230=y # CONFIG_ARM_ERRATA_742231 is not set CONFIG_PL310_ERRATA_588369=y +CONFIG_PL310_ERRATA_769419=y CONFIG_ARM_ERRATA_720789=y # CONFIG_PL310_ERRATA_727915 is not set # CONFIG_ARM_ERRATA_743622 is not set @@ -44,9 +44,6 @@ CONFIG_ARM_ERRATA_720789=y # CONFIG_ARM_ERRATA_754327 is not set # CONFIG_ARM_ERRATA_764369 is not set CONFIG_SMP_ON_UP=y -CONFIG_ARM_CPU_TOPOLOGY=y -CONFIG_SCHED_MC=y -CONFIG_SCHED_SMT=y CONFIG_LOCAL_TIMERS=y # CONFIG_THUMB2_KERNEL is not set CONFIG_HW_PERF_EVENTS=y |