diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-08 04:59:07 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-08 04:59:07 +0400 |
| commit | c1a567d31b5488f4593eae7ca215264947b355ca (patch) | |
| tree | 347b8226a2e92676dc2618d8109b99aa275aa31e /arch/arm/mach-sti/Kconfig | |
| parent | 14b596c9d80bf63da3f0fcbddfd67eb62197afb4 (diff) | |
| parent | cd3de83f147601356395b57a8673e9c5ff1e59d1 (diff) | |
| download | linux-c1a567d31b5488f4593eae7ca215264947b355ca.tar.xz | |
Merge 3.16-rc4 into staging-next
We want the staging tree fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-sti/Kconfig')
| -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 |