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/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/timer/timer.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
index 5183df6af7..25d4c5cea1 100644
--- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-09 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * timer/timer.c: Include <rtems/btimer.h>.
+ Fix benchmark_timer_read() definition.
+
2011-02-02 Ralf Corsépius <ralf.corsepius@rtems.org>
* configure.ac: Require autoconf-2.68, automake-1.11.1.
diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
index 7194a04a3e..0793b04cf5 100644
--- a/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/mvme136/timer/timer.c
@@ -9,6 +9,7 @@
* $Id$
*/
+#include <rtems/btimer.h>
#include <bsp.h>
#include <rtems/zilog/z8036.h>
@@ -51,7 +52,7 @@ void benchmark_timer_initialize(void)
/* (6 countdowns) to start/stop the timer. */
#define LEAST_VALID 10 /* Don't trust a value lower than this */
-int benchmark_timer_read(void)
+uint32_t benchmark_timer_read(void)
{
/*
uint8_t msb, lsb;