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/genmcf548x/ChangeLog     | 5 +++++
 c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog
index 6e0e14d443..13b139feb4 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog
+++ b/c/src/lib/libbsp/m68k/genmcf548x/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/genmcf548x/timer/timer.c b/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c
index 4fae6d18ec..96841b522c 100644
--- a/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c
+++ b/c/src/lib/libbsp/m68k/genmcf548x/timer/timer.c
@@ -51,6 +51,7 @@
  */
 
 #include <rtems.h>
+#include <rtems/btimer.h>
 #include <bsp.h>
 #include <mcf548x/mcf548x.h>
 
@@ -67,7 +68,7 @@ void benchmark_timer_initialize(void)
  * Return timer value in microsecond units
  * XLB clock 100 MHz / 1us is equal to 100 counts
  */
-int
+uint32_t
 benchmark_timer_read(void)
 {
     microsecond_timer_value = (0xFFFFFFFF - MCF548X_SLT_SCNT1)/100;
-- 
cgit v1.2.3