summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/mvme136
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/lib/libbsp/m68k/mvme136')
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/ChangeLog4
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/include/bsp.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
index 1b0a7552ed..3c85f618f1 100644
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27 Joel Sherrill <joel@OARcorp.com>
+
+ * include/bsp.h: Renamed delay() to rtems_bsp_delay().
+
2001-09-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/Makefile.am: Use 'TMPINSTALL_FILES ='.
diff --git a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
index 43764048bf..799b7597bd 100644
--- a/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mvme136/include/bsp.h
@@ -67,7 +67,7 @@ extern "C" {
* This is very dependent on the clock speed of the target.
*/
-#define delay( microseconds ) \
+#define rtems_bsp_delay( microseconds ) \
{ register rtems_unsigned32 _delay=(microseconds); \
register rtems_unsigned32 _tmp=123; \
asm volatile( "0: \