diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-03-19 16:59:34 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-03-19 17:00:01 +0100 |
| commit | 4654eba8cbb3fcf48c6fc24fbaffa0623d9faea2 (patch) | |
| tree | 0b3056c04bda1988a3705f315680224387d5a68b /arch/arm/mach-mvebu/Kconfig | |
| parent | 09b9ddfaa18317f463085d602cf5f60a5fa88665 (diff) | |
| parent | a6618f4aedb2b60932d766bd82ae7ce866e842aa (diff) | |
Merge branch 'for-linus' into for-next
Back-merge of for-linus branch for applying the further UAC3 patches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'arch/arm/mach-mvebu/Kconfig')
| -rw-r--r-- | arch/arm/mach-mvebu/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 6b32dc527edc..2c20599cc350 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -41,7 +41,7 @@ config MACH_ARMADA_375 depends on ARCH_MULTI_V7 select ARMADA_370_XP_IRQ select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 select ARM_GIC select ARMADA_375_CLK select HAVE_ARM_SCU @@ -57,7 +57,7 @@ config MACH_ARMADA_38X bool "Marvell Armada 380/385 boards" depends on ARCH_MULTI_V7 select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 select ARM_GIC select ARM_GLOBAL_TIMER select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK |