From 52841b58000d03cb005dcedb8c553ce271b8d9dc Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Fri, 10 Nov 2017 14:22:40 -0600
Subject: csb360/include/bsp.h: Rename delay() to rtems_bsp_delay() to avoid
 conflicts

---
 c/src/lib/libbsp/m68k/csb360/include/bsp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/c/src/lib/libbsp/m68k/csb360/include/bsp.h b/c/src/lib/libbsp/m68k/csb360/include/bsp.h
index 92aa6dee9d..5272e17ae2 100644
--- a/c/src/lib/libbsp/m68k/csb360/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/csb360/include/bsp.h
@@ -138,7 +138,7 @@ extern int rtems_enet_driver_attach (struct rtems_bsdnet_ifconfig *config);
  *  This is very dependent on the clock speed of the target.
  */
 
-#define delay( microseconds ) \
+#define rtems_bsp_delay( microseconds ) \
   { register uint32_t _delay=(microseconds); \
     register uint32_t _tmp=123; \
     __asm__ volatile( "0: \
-- 
cgit v1.2.3