From 86639587dd0ac9b7512a4d11ea6b1cb332bbf554 Mon Sep 17 00:00:00 2001 From: Dave Wu Date: Mon, 2 Oct 2017 14:36:03 +1100 Subject: [PATCH] Fixed a merge error for LPC11U34_421. --- targets/targets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 targets/targets.json diff --git a/targets/targets.json b/targets/targets.json old mode 100644 new mode 100755 index 2349c15f4f..68d2af10d0 --- a/targets/targets.json +++ b/targets/targets.json @@ -109,7 +109,7 @@ "extra_labels": ["NXP", "LPC11UXX"], "macros": ["CMSIS_VECTAB_VIRTUAL", "CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""], "supported_toolchains": ["ARM", "uARM", "GCC_ARM"], - "device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"], + "device_has": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "SERIAL", "SLEEP", "SPI", "SPISLAVE"], "default_lib": "small", "device_name": "LPC11U34FBD48/311" },