From 4678a31efa5bac01a862ca3080cf4c9786dbd67a Mon Sep 17 00:00:00 2001
From: "U-ONSEMI\\fg64rh" <fg64rh@FG64RH-L1.ad.onsemi.com>
Date: Thu, 23 Feb 2017 18:47:15 +0530
Subject: [PATCH] Conflict resolved

---
 targets/targets.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/targets.json b/targets/targets.json
index af5971049e..20ace507ca 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -2595,7 +2595,7 @@
         "post_binary_hook": {"function": "NCS36510TargetCode.ncs36510_addfib"},
         "macros": ["CM3", "CPU_NCS36510", "TARGET_NCS36510", "LOAD_ADDRESS=0x3000"],
         "supported_toolchains": ["GCC_ARM", "ARM", "IAR"],
-        "device_has": ["ANALOGIN", "SERIAL", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "LOWPOWERTIMER", "TRNG"],
+        "device_has": ["ANALOGIN", "SERIAL", "I2C", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "LOWPOWERTIMER", "TRNG", "SPISLAVE"],
         "release_versions": ["2", "5"]
     },
     "NUMAKER_PFM_M453": {