6 files changed, 18 insertions, 4 deletions
diff --git a/cpukit/score/cpu/a29k/ChangeLog b/cpukit/score/cpu/a29k/ChangeLog
index 4da47d0e31..d96fb282a8 100644
--- a/cpukit/score/cpu/a29k/ChangeLog
+++ b/cpukit/score/cpu/a29k/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-03	Joel Sherrill <joel@OARcorp.com>
+
+	* Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
+	* rtems/score/a29ktypes.h: Removed.
+	* rtems/score/types.h: New file via CVS magic.
+	* Makefile.am, rtems/score/cpu.h: Account for name change.
+
 2002-03-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac:
diff --git a/cpukit/score/cpu/a29k/Makefile.am b/cpukit/score/cpu/a29k/Makefile.am
index a8689053e8..37292013b8 100644
--- a/cpukit/score/cpu/a29k/Makefile.am
+++ b/cpukit/score/cpu/a29k/Makefile.am
@@ -26,7 +26,7 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 include_rtems_scoredir = $(includedir)/rtems/score
 include_rtems_score_HEADERS = \
     rtems/score/a29k.h \
-    rtems/score/a29ktypes.h \
+    rtems/score/types.h \
     rtems/score/cpu.h \
     rtems/score/cpu_asm.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
diff --git a/cpukit/score/cpu/a29k/rtems/score/cpu.h b/cpukit/score/cpu/a29k/rtems/score/cpu.h
index 8afa432865..a20543f0d2 100644
--- a/cpukit/score/cpu/a29k/rtems/score/cpu.h
+++ b/cpukit/score/cpu/a29k/rtems/score/cpu.h
@@ -40,7 +40,7 @@ extern "C" {
 
 #include <rtems/score/a29k.h>                /* pick up machine definitions */
 #ifndef ASM
-#include <rtems/score/a29ktypes.h>
+#include <rtems/score/types.h>
 #endif
 
 extern unsigned int a29k_disable( void );
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog
index bd24e9bc73..75f773c7e9 100644
--- a/cpukit/score/cpu/arm/ChangeLog
+++ b/cpukit/score/cpu/arm/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-03	Joel Sherrill <joel@OARcorp.com>
+
+	* Per PR94, all rtems/score/CPUtypes.h are named rtems/score/types.h.
+	* rtems/score/a29ktypes.h: Removed.
+	* rtems/score/types.h: New file via CVS magic.
+	* Makefile.am, rtems/score/cpu.h: Account for name change.
+
 2002-03-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac:
diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am
index e1a9b65dc1..972edd942b 100644
--- a/cpukit/score/cpu/arm/Makefile.am
+++ b/cpukit/score/cpu/arm/Makefile.am
@@ -27,7 +27,7 @@ include_rtems_scoredir = $(includedir)/rtems/score
 include_rtems_score_HEADERS = \
     rtems/score/cpu.h \
     rtems/score/arm.h  \
-    rtems/score/armtypes.h
+    rtems/score/types.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
     $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
diff --git a/cpukit/score/cpu/arm/rtems/score/cpu.h b/cpukit/score/cpu/arm/rtems/score/cpu.h
index 62adccfe5d..ebe494504b 100644
--- a/cpukit/score/cpu/arm/rtems/score/cpu.h
+++ b/cpukit/score/cpu/arm/rtems/score/cpu.h
@@ -21,7 +21,7 @@ extern "C" {
 
 #include <rtems/score/arm.h>            /* pick up machine definitions */
 #ifndef ASM
-#include <rtems/score/armtypes.h>
+#include <rtems/score/types.h>
 #endif
 
 /* conditional compilation parameters */