summaryrefslogtreecommitdiff
path: root/chip
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2021-03-04 11:48:25 -0800
committerCommit Bot <commit-bot@chromium.org>2021-03-16 19:04:52 +0000
commit82a0bda9e9012be92d19f90df75274feecd985e6 (patch)
tree6db288d3aab7aaca37608b2302103d071fa59c61 /chip
parentf466ce078261a513ffd561d6deaaa15947424e19 (diff)
downloadchrome-ec-82a0bda9e9012be92d19f90df75274feecd985e6.tar.gz
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 <tomhughes@chromium.org> Change-Id: I8ac62e6fbcab8fe0c842c737d183b462899bd017 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2740563 Reviewed-by: Scott Collyer <scollyer@chromium.org>
Diffstat (limited to 'chip')
-rw-r--r--chip/stm32/registers.h2
1 files changed, 1 insertions, 1 deletions
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;