summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-05-28 13:07:00 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-05-28 13:07:00 +0000
commit803ce2919be2d8647a825dbffa38215875004659 (patch)
tree068626c31de093c83d55a3ba796c4a4cf5a8a51c /c
parentSwitched from picking up the .rel for each subdirectory in the (diff)
downloadrtems-803ce2919be2d8647a825dbffa38215875004659.tar.bz2
Renamed clock.c to rtclock.c to avoid conflicts with clock drivers
in various BSPs.
Diffstat (limited to 'c')
-rw-r--r--c/src/exec/rtems/src/Makefile.in2
-rw-r--r--c/src/exec/rtems/src/clock.c23
2 files changed, 1 insertions, 24 deletions
diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in
index 868ac0aca4..b04af25553 100644
--- a/c/src/exec/rtems/src/Makefile.in
+++ b/c/src/exec/rtems/src/Makefile.in
@@ -32,7 +32,7 @@ INTR_PIECES=\
intr intrbody intrcatch
CLOCK_PIECES=\
- clock clockget clockset clocktick
+ rtclock clockget clockset clocktick
TIMER_PIECES=\
rtemstimer timercancel timercreate timerdelete timerfireafter \
diff --git a/c/src/exec/rtems/src/clock.c b/c/src/exec/rtems/src/clock.c
deleted file mode 100644
index 84b1cd408a..0000000000
--- a/c/src/exec/rtems/src/clock.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Clock Manager
- *
- * COPYRIGHT (c) 1989-1998.
- * On-Line Applications Research Corporation (OAR).
- * Copyright assigned to U.S. Government, 1994.
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.OARcorp.com/rtems/license.html.
- *
- * $Id$
- */
-
-#include <rtems/system.h>
-#include <rtems/rtems/status.h>
-#include <rtems/rtems/clock.h>
-#include <rtems/score/isr.h>
-#include <rtems/score/thread.h>
-#include <rtems/score/tod.h>
-#include <rtems/score/watchdog.h>
-
-/* No initialization routine */