diff options
| author | Wini-Buh <[email protected]> | 2021-06-29 00:19:30 +0200 |
|---|---|---|
| committer | Wini-Buh <[email protected]> | 2021-06-29 00:19:30 +0200 |
| commit | cb0f1d98db3c4bcfdcba231a78b1c18805483ad8 (patch) | |
| tree | fa88fc9cb41a59a2089ea2e43d8feac2b8987474 /src/portable/renesas/usba | |
| parent | 970da35fb303f1aa44e6279b14b80418f3250f60 (diff) | |
| parent | 6e939de9d673979721b83b0b3ab724ebd652770c (diff) | |
Merge remote-tracking branch 'origin/master' into CCRX_Port
# Conflicts:
# src/portable/renesas/usba/dcd_usba.c
# src/tusb_option.h
Diffstat (limited to 'src/portable/renesas/usba')
| -rw-r--r-- | src/portable/renesas/usba/dcd_usba.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/portable/renesas/usba/dcd_usba.c b/src/portable/renesas/usba/dcd_usba.c index 51729de06..bb4a08e2b 100644 --- a/src/portable/renesas/usba/dcd_usba.c +++ b/src/portable/renesas/usba/dcd_usba.c @@ -26,8 +26,13 @@ #include "tusb_option.h" +<<<<<<< HEAD #if TUSB_OPT_DEVICE_ENABLED && (( CFG_TUSB_MCU == OPT_MCU_RX63X ) || ( CFG_TUSB_MCU == OPT_MCU_RX72N )) +======= +#if TUSB_OPT_DEVICE_ENABLED && ( CFG_TUSB_MCU == OPT_MCU_RX63X || \ + CFG_TUSB_MCU == OPT_MCU_RX65X) +>>>>>>> origin/master #include "device/dcd.h" #include "iodefine.h" |