diff options
| author | Linus Torvalds | 2014-06-24 22:59:00 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-06-24 22:59:00 +0200 |
| commit | b4b664bef407bc80f325b2f2ab9350823c2869de (patch) | |
| tree | 68ee04a0c995dbf7aa3ad889362dc63c7c986745 /arch/arm/mach-sti | |
| parent | Merge tag 'compress-3.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ARM: arm925: ensure assembly sets up writethrough mapping (diff) | |
| download | kernel-qcow2-linux-b4b664bef407bc80f325b2f2ab9350823c2869de.tar.gz kernel-qcow2-linux-b4b664bef407bc80f325b2f2ab9350823c2869de.tar.xz kernel-qcow2-linux-b4b664bef407bc80f325b2f2ab9350823c2869de.zip | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A number of low impact fixes, the most noticable one is the thumb2
frame pointer fix. We also fix a regression caused during this merge
window with ARM925 CPUs running with caches disabled, and fix a number
of warnings"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: arm925: ensure assembly sets up writethrough mapping
ARM: perf: fix compiler warning with gcc 4.6.4 (and tidy code)
ARM: l2c: fix dependencies on PL310 errata symbols
ARM: 8069/1: Make thread_save_fp macro aware of THUMB2 mode
ARM: 8068/1: scoop: Remove unused variable
Diffstat (limited to 'arch/arm/mach-sti')
| -rw-r--r-- | arch/arm/mach-sti/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig index 7e33e9d2c42e..878e9ec97d0f 100644 --- a/arch/arm/mach-sti/Kconfig +++ b/arch/arm/mach-sti/Kconfig @@ -11,8 +11,8 @@ menuconfig ARCH_STI select ARM_ERRATA_754322 select ARM_ERRATA_764369 if SMP select ARM_ERRATA_775420 - select PL310_ERRATA_753970 if CACHE_PL310 - select PL310_ERRATA_769419 if CACHE_PL310 + select PL310_ERRATA_753970 if CACHE_L2X0 + select PL310_ERRATA_769419 if CACHE_L2X0 help Include support for STiH41x SOCs like STiH415/416 using the device tree for discovery |