summaryrefslogtreecommitdiff
path: root/ports/nrf/common-hal/microcontroller/Pin.h
diff options
context:
space:
mode:
authorladyada <limor@ladyada.net>2018-08-26 20:37:12 -0400
committerladyada <limor@ladyada.net>2018-08-26 20:37:12 -0400
commitded38d30b6bd9621ab5254f849f131946dfccbf4 (patch)
tree848e2e830cedc5388bed15f30b3acc11f74bdb41 /ports/nrf/common-hal/microcontroller/Pin.h
parent5c3fcc7490343d89151d15ba7135d9bdd87f6d32 (diff)
rename pin.h to nrf_pin.h to avoid conflict with Pin.h
Diffstat (limited to 'ports/nrf/common-hal/microcontroller/Pin.h')
-rw-r--r--ports/nrf/common-hal/microcontroller/Pin.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ports/nrf/common-hal/microcontroller/Pin.h b/ports/nrf/common-hal/microcontroller/Pin.h
index 66cd011da..1694a8249 100644
--- a/ports/nrf/common-hal/microcontroller/Pin.h
+++ b/ports/nrf/common-hal/microcontroller/Pin.h
@@ -27,7 +27,7 @@
#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_MICROCONTROLLER_PIN_H
#define MICROPY_INCLUDED_NRF_COMMON_HAL_MICROCONTROLLER_PIN_H
-#include "pin.h"
+#include "nrf_pin.h"
#include "py/mphal.h"
#define mcu_pin_obj_t pin_obj_t