diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-20 09:28:34 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-20 09:28:34 +0300 |
| commit | 26e42a020471ffc9a4086feb3900976a49cff42b (patch) | |
| tree | 5b6435fa4021b020a371f97bab4637364f13f3aa /arch | |
| parent | 821596a50aba6873ff4ea8fdf2b1515638c3c8a3 (diff) | |
| parent | ca9ae5ec4ef0ed13833b03297ab319676965492c (diff) | |
| download | linux-26e42a020471ffc9a4086feb3900976a49cff42b.tar.xz | |
Merge tag 'arch-timer-gtdt' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux into timers/core
Pull arch timer GTDT support from Mark Rutland
- arch_timer cleanups and refactoring
- new common GTDT parser
- GTDT-based MMIO arch_timer support
- GTDT-based SBSA watchdog support
Fix up a trivial pr_err() conflict.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 3741859765cf..7e2baec6f23a 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -2,6 +2,7 @@ config ARM64 def_bool y select ACPI_CCA_REQUIRED if ACPI select ACPI_GENERIC_GSI if ACPI + select ACPI_GTDT if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI select ACPI_MCFG if ACPI select ACPI_SPCR_TABLE if ACPI |