diff options
| author | xoviat <[email protected]> | 2023-07-28 17:18:22 -0500 |
|---|---|---|
| committer | xoviat <[email protected]> | 2023-07-28 17:18:22 -0500 |
| commit | c7c701b3e312c14ca00eabfa8b6d422cec869cbf (patch) | |
| tree | df9388eca3a45127eb36a670396d3a2c91517fa0 /embassy-nrf/src/timer.rs | |
| parent | e495d606ec62ccfd72eaf9fc868455da217e2d5c (diff) | |
| parent | cc414e63d3b7aec7da07d9097cf8a78b5d55a73a (diff) | |
Merge branch 'main' of https://github.com/embassy-rs/embassy into hrtim
Diffstat (limited to 'embassy-nrf/src/timer.rs')
| -rw-r--r-- | embassy-nrf/src/timer.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/embassy-nrf/src/timer.rs b/embassy-nrf/src/timer.rs index 04748238d..3dbfdac42 100644 --- a/embassy-nrf/src/timer.rs +++ b/embassy-nrf/src/timer.rs | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #![macro_use] | 7 | #![macro_use] |
| 8 | 8 | ||
| 9 | use embassy_hal_common::{into_ref, PeripheralRef}; | 9 | use embassy_hal_internal::{into_ref, PeripheralRef}; |
| 10 | 10 | ||
| 11 | use crate::ppi::{Event, Task}; | 11 | use crate::ppi::{Event, Task}; |
| 12 | use crate::{pac, Peripheral}; | 12 | use crate::{pac, Peripheral}; |