diff options
| author | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
|---|---|---|
| committer | goueslati <[email protected]> | 2023-06-12 14:27:53 +0100 |
| commit | 2d89cfb18f00aefbfa108728dfea3398e80ea3e4 (patch) | |
| tree | 6485dacac7e61c4378ac522e709edb0a86bd7523 /embassy-hal-common/src/lib.rs | |
| parent | 2dd5ce83ec0421564e85b667f5dabd592f313e5c (diff) | |
| parent | ab86b060500ceda1c80e39f35af69cb08a7b63a2 (diff) | |
fix merge conflict
Diffstat (limited to 'embassy-hal-common/src/lib.rs')
| -rw-r--r-- | embassy-hal-common/src/lib.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/embassy-hal-common/src/lib.rs b/embassy-hal-common/src/lib.rs index b2a35cd35..235964aa4 100644 --- a/embassy-hal-common/src/lib.rs +++ b/embassy-hal-common/src/lib.rs | |||
| @@ -11,3 +11,6 @@ mod peripheral; | |||
| 11 | pub mod ratio; | 11 | pub mod ratio; |
| 12 | pub mod ring_buffer; | 12 | pub mod ring_buffer; |
| 13 | pub use peripheral::{Peripheral, PeripheralRef}; | 13 | pub use peripheral::{Peripheral, PeripheralRef}; |
| 14 | |||
| 15 | #[cfg(feature = "cortex-m")] | ||
| 16 | pub mod interrupt; | ||