From ca201c9b6ae33319d157ab0f32f48cb64465d60e Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 5 Dec 1995 15:28:12 +0000
Subject: minor changes so it would compile

---
 c/src/exec/score/cpu/hppa1.1/cpu.c     |  4 +---
 c/src/exec/score/cpu/hppa1.1/cpu.h     |  4 ++--
 c/src/exec/score/cpu/hppa1.1/cpu_asm.s |  8 ++++----
 c/src/exec/score/cpu/hppa1.1/hppa.h    | 10 +++++-----
 cpukit/score/cpu/hppa1.1/cpu.c         |  4 +---
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/c/src/exec/score/cpu/hppa1.1/cpu.c b/c/src/exec/score/cpu/hppa1.1/cpu.c
index 3aa73e073c..a6cddbc804 100644
--- a/c/src/exec/score/cpu/hppa1.1/cpu.c
+++ b/c/src/exec/score/cpu/hppa1.1/cpu.c
@@ -18,9 +18,7 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/fatal.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/wkspace.h>
+#include <rtems/score/isr.h>
 
 void hppa_external_interrupt_initialize(void);
 void hppa_external_interrupt_enable(unsigned32);
diff --git a/c/src/exec/score/cpu/hppa1.1/cpu.h b/c/src/exec/score/cpu/hppa1.1/cpu.h
index 87be960606..095a03735f 100644
--- a/c/src/exec/score/cpu/hppa1.1/cpu.h
+++ b/c/src/exec/score/cpu/hppa1.1/cpu.h
@@ -30,9 +30,9 @@
 extern "C" {
 #endif
 
-#include <rtems/core/hppa.h>              /* pick up machine definitions */
+#include <rtems/score/hppa.h>              /* pick up machine definitions */
 #ifndef ASM
-#include <rtems/core/hppatypes.h>
+#include <rtems/score/hppatypes.h>
 #endif
 
 /* conditional compilation parameters */
diff --git a/c/src/exec/score/cpu/hppa1.1/cpu_asm.s b/c/src/exec/score/cpu/hppa1.1/cpu_asm.s
index b14eb7f88f..3832385ccd 100644
--- a/c/src/exec/score/cpu/hppa1.1/cpu_asm.s
+++ b/c/src/exec/score/cpu/hppa1.1/cpu_asm.s
@@ -27,11 +27,11 @@
 #  $Id$
 #
 
-#include <rtems/core/hppa.h>
-#include <rtems/core/cpu_asm.h>
-#include <rtems/core/cpu.h>
+#include <rtems/score/hppa.h>
+#include <rtems/score/cpu_asm.h>
+#include <rtems/score/cpu.h>
 
-#include <rtems/core/offsets.h>
+#include <rtems/score/offsets.h>
 
 	.SPACE $PRIVATE$
 	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31
diff --git a/c/src/exec/score/cpu/hppa1.1/hppa.h b/c/src/exec/score/cpu/hppa1.1/hppa.h
index 79f4070f98..f8bb55c74c 100644
--- a/c/src/exec/score/cpu/hppa1.1/hppa.h
+++ b/c/src/exec/score/cpu/hppa1.1/hppa.h
@@ -64,23 +64,23 @@ extern "C" {
  *  present in a particular member of the family.
  */
 
-#if !defined(RTEMS_MODEL_NAME)
+#if !defined(CPU_MODEL_NAME)
 
 #if defined(hppa7100)
 
-#define RTEMS_MODEL_NAME  "hppa 7100"
+#define CPU_MODEL_NAME  "hppa 7100"
 
 #elif defined(hppa7200)
 
-#define RTEMS_MODEL_NAME  "hppa 7200"
+#define CPU_MODEL_NAME  "hppa 7200"
 
 #else
 
-#define RTEMS_MODEL_NAME  Unsupported CPU Model	     /* cause an error on usage */
+#define CPU_MODEL_NAME  Unsupported CPU Model	     /* cause an error on usage */
 
 #endif
 
-#endif /* !defined(RTEMS_MODEL_NAME) */
+#endif /* !defined(CPU_MODEL_NAME) */
           
 /*
  *  Define the name of the CPU family.
diff --git a/cpukit/score/cpu/hppa1.1/cpu.c b/cpukit/score/cpu/hppa1.1/cpu.c
index 3aa73e073c..a6cddbc804 100644
--- a/cpukit/score/cpu/hppa1.1/cpu.c
+++ b/cpukit/score/cpu/hppa1.1/cpu.c
@@ -18,9 +18,7 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/fatal.h>
-#include <rtems/core/isr.h>
-#include <rtems/core/wkspace.h>
+#include <rtems/score/isr.h>
 
 void hppa_external_interrupt_initialize(void);
 void hppa_external_interrupt_enable(unsigned32);
-- 
cgit v1.2.3