From 0f6a35ba7346232599cd22e7f76dc99f5b87923b Mon Sep 17 00:00:00 2001
From: Leszek Rusinowicz <leszek.rusinowicz@futureelectronics.com>
Date: Wed, 19 Dec 2018 13:35:07 +0100
Subject: [PATCH] Fixing merge issue for merge into master.

---
 targets/TARGET_Cypress/TARGET_PSOC6/psoc6_utils.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6_utils.c b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6_utils.c
index 3c0da3f462..1ea8352f53 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/psoc6_utils.c
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/psoc6_utils.c
@@ -100,7 +100,6 @@ do {                                                            \
 #define SRM_TCPWM(num)                     {(num), (0)}
 
 #define DEFAULT_PORT_RES        0xff
-#define DEFAULT_DIVIDER8_RES    0xff
 #define DEFAULT_DIVIDER_RES     0xffff
 #define DEFAULT_DIVIDER8_RES    0xffff
 #define DEFAULT_SCM_RES         1