diff options
| author | yangjie <[email protected]> | 2020-12-28 12:02:31 +0800 |
|---|---|---|
| committer | yangjie <[email protected]> | 2020-12-28 12:02:31 +0800 |
| commit | eeaf1fcc50a9a6d25bebcc531db8e03baafaded3 (patch) | |
| tree | 3a7e70fbb26fad36211874a5bc4f9f9f22c8fa38 /bsp/imxrt | |
| parent | ef62febf1f2461bdd72efcffde050905865a99c5 (diff) | |
| parent | e3e86337862c6d84f2b55906a49d48aa33084d39 (diff) | |
resolve Conflicts
bsp/nrf52832/board/Sconscript
bsp/nrf52832/startups/Sconscript
bsp/raspberry-pi/raspi4-32/driver/SConscript
Diffstat (limited to 'bsp/imxrt')
| -rw-r--r-- | bsp/imxrt/libraries/drivers/drv_can.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bsp/imxrt/libraries/drivers/drv_can.h b/bsp/imxrt/libraries/drivers/drv_can.h index 55cca16200..d5d2b13f2e 100644 --- a/bsp/imxrt/libraries/drivers/drv_can.h +++ b/bsp/imxrt/libraries/drivers/drv_can.h @@ -8,9 +8,9 @@ * 2019-06-28 misonyo the first version. */ -#ifndef DRV_SPI_H__ -#define DRV_SPI_H__ +#ifndef DRV_CAN_H__ +#define DRV_CAN_H__ int rt_hw_can_init(void); -#endif /* DRV_SPI_H__ */ +#endif /* DRV_CAN_H__ */ |