From 26c173775a7f6ac412d0715ede1ab86a1f9169a9 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Wed, 9 Feb 2011 12:15:54 +0000
Subject: =?UTF-8?q?2011-02-09=09Ralf=20Cors=C3=A9pius=20<ralf.corsepius@rt?=
 =?UTF-8?q?ems.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

	* timer/timer.c: Include <rtems/btimer.h>.
	Fix benchmark_timer_read() definition.
---
 c/src/lib/libbsp/m68k/mvme136/ChangeLog     | 5 +++++
 c/src/lib/libbsp/m68k/mvme136/timer/timer.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'c/src/lib/libbsp/m68k/mvme136')

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;
-- 
cgit v1.2.3