diff options
Diffstat (limited to 'platforms/avr/drivers/serial.c')
| -rw-r--r-- | platforms/avr/drivers/serial.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/platforms/avr/drivers/serial.c b/platforms/avr/drivers/serial.c index 6a36aa5f7f..31eab7b7c0 100644 --- a/platforms/avr/drivers/serial.c +++ b/platforms/avr/drivers/serial.c @@ -53,8 +53,13 @@ # define EICRx EICRA # endif +<<<<<<< HEAD +// ATmegaxxU2 specific config +# if defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) +======= // ATmegaxxU2/AT90USB162 specific config # if defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_AT90USB162__) +>>>>>>> 0.12.52~1 // PD4(INT5), PD6(INT6), PD7(INT7), PC7(INT4) # if SOFT_SERIAL_PIN == D4 # define EIMSK_BIT _BV(INT5) |