2007-06-22 Joel Sherrill <joel.sherrill@OARcorp.com>

	* console/leds.c, console/mc68ec.c: Rename delay to rtems_bsp_delay to
	avoid conflicts in application space.

3 files changed, 9 insertions, 4 deletions

diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog
index 4f7da58662..a33b153488 100644
--- a/c/src/lib/libbsp/m68k/idp/ChangeLog
+++ b/c/src/lib/libbsp/m68k/idp/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-22	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* console/leds.c, console/mc68ec.c: Rename delay to rtems_bsp_delay to
+	avoid conflicts in application space.
+
 2007-05-03	Joel Sherrill <joel@OARcorp.com>
 
 	* startup/linkcmds: Handle .data.* sections
diff --git a/c/src/lib/libbsp/m68k/idp/console/leds.c b/c/src/lib/libbsp/m68k/idp/console/leds.c
index 06664b536e..3970d74009 100644
--- a/c/src/lib/libbsp/m68k/idp/console/leds.c
+++ b/c/src/lib/libbsp/m68k/idp/console/leds.c
@@ -71,12 +71,12 @@ zylons()
 {
   unsigned char *leds 	= (unsigned char *)LED_ADDR;
   unsigned char curled = 0xfe;
-  void delay( int );
+  void rtems_bsp_delay( int );
 
   while (1)
     {
       *leds = curled;
       curled = (curled >> 1) | (curled << 7);
-      delay ( 8000 );
+      rtems_bsp_delay ( 8000 );
     }
 }
diff --git a/c/src/lib/libbsp/m68k/idp/console/mc68ec.c b/c/src/lib/libbsp/m68k/idp/console/mc68ec.c
index fd837981d2..e1642deb25 100644
--- a/c/src/lib/libbsp/m68k/idp/console/mc68ec.c
+++ b/c/src/lib/libbsp/m68k/idp/console/mc68ec.c
@@ -8,10 +8,10 @@
 #include "leds.h"
 
 /*
- * delay -- delay execution. This is an ugly hack. It should
+ * rtems_bsp_delay -- delay execution. This is an ugly hack. It should
  *          use the timer, but I'm waiting for docs. (sigh)
  */
-void delay(num)
+void rtems_bsp_delay(num)
 int num;
 {
   while (num--)