summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/mvme136
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-30 19:58:02 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-11-30 19:58:02 +0000
commit48bfd9925727e46aada26c40c967a5ad57d98919 (patch)
tree1194fe547c22d35075005c721d6d9ae015fbe24d /c/src/lib/libbsp/m68k/mvme136
parentRemoved duplicate definition of rtems_filesystem_umask. (diff)
downloadrtems-48bfd9925727e46aada26c40c967a5ad57d98919.tar.bz2
Renamed shm.h to shm_driver.h to avoid conflicts with POSIX shm.h.
Renamed file shmsupp/intr.c in some BSPs to shmsupp/cause_intr.c to avoid conflict with rtems/src/intr.c (Classic API Interrupt Manager).
Diffstat (limited to 'c/src/lib/libbsp/m68k/mvme136')
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/shmsupp/addrconv.c2
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/shmsupp/getcfg.c2
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c2
-rw-r--r--c/src/lib/libbsp/m68k/mvme136/shmsupp/mpisr.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme136/shmsupp/addrconv.c b/c/src/lib/libbsp/m68k/mvme136/shmsupp/addrconv.c
index fc1bcd83ba..39f323614c 100644
--- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/addrconv.c
+++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/addrconv.c
@@ -21,7 +21,7 @@
#include <rtems.h>
#include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
void *Shm_Convert_address(
void *address
diff --git a/c/src/lib/libbsp/m68k/mvme136/shmsupp/getcfg.c b/c/src/lib/libbsp/m68k/mvme136/shmsupp/getcfg.c
index 1cf0e9c3bd..0802976a32 100644
--- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/getcfg.c
+++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/getcfg.c
@@ -33,7 +33,7 @@
*/
#include <rtems.h>
-#include "shm.h"
+#include "shm_driver.h"
#define INTERRUPT 1 /* MVME136 target supports both */
#define POLLING 0 /* polling and interrupt modes */
diff --git a/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c b/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c
index 6917d3fc22..63729ca771 100644
--- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c
+++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/lock.c
@@ -18,7 +18,7 @@
#include <rtems.h>
#include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
/*
* Shm_Initialize_lock
diff --git a/c/src/lib/libbsp/m68k/mvme136/shmsupp/mpisr.c b/c/src/lib/libbsp/m68k/mvme136/shmsupp/mpisr.c
index f04ab000e6..20bb9a7401 100644
--- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/mpisr.c
+++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/mpisr.c
@@ -15,7 +15,7 @@
#include <rtems.h>
#include <bsp.h>
-#include <shm.h>
+#include <shm_driver.h>
rtems_isr Shm_isr_mvme136()
{