diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2024-05-10 13:03:56 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-05-10 13:03:56 +0200 |
| commit | a3825a7691585485e960cec04ce6667d176b7c67 (patch) | |
| tree | 3ca6094be0a9dde6a3e37fda16d1144f77a096e0 /drivers/clocksource/arm_arch_timer.c | |
| parent | ddd9120983c3efbcaa3a4c7777da1440f8ce27d8 (diff) | |
| parent | 2030a7e11f161b4067bd4eadd984cdb36446fcca (diff) | |
Merge tag 'timers-v6.10-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent/source updates from Daniel Lezcano:
- Add the R9A09G057 compatible bindings in the DT documentation and
add specific code to deal with the probe routine being called twice
(Geert Uytterhoeven)
- Remove unused field in the struct dmtimer in the TI driver
(Christophe JAILLET)
- Constify the hisi_161010101_oem_info variable in the ARM arch timer
(Stephen Boyd)
Link: https://lore.kernel.org/lkml/7ca1c46a-93e6-4f67-bee3-623cb56764fa@linaro.org
Diffstat (limited to 'drivers/clocksource/arm_arch_timer.c')
| -rw-r--r-- | drivers/clocksource/arm_arch_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 8d4a52056684..5bb43cc1a8df 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -331,7 +331,7 @@ static u64 notrace hisi_161010101_read_cntvct_el0(void) return __hisi_161010101_read_reg(cntvct_el0); } -static struct ate_acpi_oem_info hisi_161010101_oem_info[] = { +static const struct ate_acpi_oem_info hisi_161010101_oem_info[] = { /* * Note that trailing spaces are required to properly match * the OEM table information. |