ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mbedmicro/mbed 

Conflicts:
	libraries/mbed/targets/hal/TARGET_NXP/TARGET_LPC176X/serial_api.c
pull/195/head
mazgch 2014-03-03 15:04:35 +01:00
parent 63f20534ca 8431561fc7
commit 7ec41d4923
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL25Z/PeripheralPins.c
View File

@ -19,7 +19,7 @@
/************RTC***************/ /************RTC***************/
const PinMap PinMap_RTC[] = { const PinMap PinMap_RTC[] = {
{PTC1, RTC_CLKIN, 2}, {PTC1, RTC_CLKIN, 1},
}; };
/************ADC***************/ /************ADC***************/

2
libraries/mbed/targets/hal/TARGET_Freescale/TARGET_KLXX/TARGET_KL46Z/PeripheralPins.c
View File

@ -18,7 +18,7 @@
/************RTC***************/ /************RTC***************/
const PinMap PinMap_RTC[] = { const PinMap PinMap_RTC[] = {
{PTC1, RTC_CLKIN, 2}, {PTC1, RTC_CLKIN, 1},
}; };
/************ADC***************/ /************ADC***************/