From 82a0bda9e9012be92d19f90df75274feecd985e6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 4 Mar 2021 11:48:25 -0800 Subject: chip/stm32: Rename field since "or" is reserved in C++ https://en.cppreference.com/w/cpp/keyword https://en.cppreference.com/w/cpp/keyword/or BRANCH=none BUG=b:144959033 TEST=make buildall Signed-off-by: Tom Hughes Change-Id: I8ac62e6fbcab8fe0c842c737d183b462899bd017 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2740563 Reviewed-by: Scott Collyer --- chip/stm32/registers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chip/stm32/registers.h') diff --git a/chip/stm32/registers.h b/chip/stm32/registers.h index 574921c63e..53b9f330a0 100644 --- a/chip/stm32/registers.h +++ b/chip/stm32/registers.h @@ -137,7 +137,7 @@ struct timer_ctlr { unsigned dcr; unsigned dmar; - unsigned or; + unsigned option_register; }; /* Must be volatile, or compiler optimizes out repeated accesses */ typedef volatile struct timer_ctlr timer_ctlr_t; -- cgit v1.2.1