Skip to content

Commit 7ec41d4

Browse files
mazgchmazgch
committed
Merge branch 'master' of https://github.com/mbedmicro/mbed
Conflicts: libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c
2 parents 63f2053 + 8431561 commit 7ec41d4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/PeripheralPins.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
/************RTC***************/
2121
const PinMap PinMap_RTC[] = {
22-
{PTC1, RTC_CLKIN, 2},
22+
{PTC1, RTC_CLKIN, 1},
2323
};
2424

2525
/************ADC***************/

‎libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PeripheralPins.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
/************RTC***************/
2020
const PinMap PinMap_RTC[] = {
21-
{PTC1, RTC_CLKIN, 2},
21+
{PTC1, RTC_CLKIN, 1},
2222
};
2323

2424
/************ADC***************/

0 commit comments

Comments
 (0)