You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/05/18 08:04:34 UTC
[GitHub] michal-narajowski closed pull request #1109: hw/mcu: Fix typo in
nrf52 config
michal-narajowski closed pull request #1109: hw/mcu: Fix typo in nrf52 config
URL: https://github.com/apache/mynewt-core/pull/1109
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/mcu/nordic/nrf52xxx/include/nrfx52_config.h b/hw/mcu/nordic/nrf52xxx/include/nrfx52_config.h
index 930ebccb5e..0c0289f8dd 100644
--- a/hw/mcu/nordic/nrf52xxx/include/nrfx52_config.h
+++ b/hw/mcu/nordic/nrf52xxx/include/nrfx52_config.h
@@ -148,7 +148,7 @@
#define NRFX_PWM_DEFAULT_CONFIG_BASE_CLOCK 4
#endif
-#ifndef NRFX_PWM_DEFAULT_CONFIG_BASE_CLOCK
+#ifndef NRFX_PWM_DEFAULT_CONFIG_COUNT_MODE
#define NRFX_PWM_DEFAULT_CONFIG_COUNT_MODE 0
#endif
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services