4 files changed, 10 insertions, 30 deletions
diff --git a/c/src/exec/score/ChangeLog b/c/src/exec/score/ChangeLog
index 6979082759..1b83f0d663 100644
--- a/c/src/exec/score/ChangeLog
+++ b/c/src/exec/score/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* include/rtems/system.h: Remove targopts.h.
+
 2002-04-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/rtems/system.h: Add the sparc to the target supporting
diff --git a/c/src/exec/score/include/rtems/system.h b/c/src/exec/score/include/rtems/system.h
index 8495206d98..92b05c340c 100644
--- a/c/src/exec/score/include/rtems/system.h
+++ b/c/src/exec/score/include/rtems/system.h
@@ -22,7 +22,7 @@ extern "C" {
 #endif
 
 /*
- *  The target options include file defines all target dependent 
+ *  The cpu options include file defines all cpu dependent 
  *  parameters for this build of RTEMS.  It must be included
  *  first so the basic macro definitions are in place.
  */
@@ -30,20 +30,6 @@ extern "C" {
 #include <rtems/score/cpuopts.h>
 
 /*
- * FIXME: No port should have to include targopts.h
- *
- *  Most cpus are ready to apply only cpuopts.h but these ports
- *  unfortunately still need targopts.h.  This means these ports
- *  are not ready to be built multilib yet. 
- */
-
-#if !defined(RTEMS_MULTILIBS)
-#if defined(__PPC__)
-#include <rtems/score/targopts.h>
-#endif
-#endif
-
-/*
  *  The following ensures that all data is declared in the space
  *  of the initialization routine for either the Initialization Manager
  *  or the initialization file for the appropriate API.  It is 
diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog
index 6979082759..1b83f0d663 100644
--- a/cpukit/score/ChangeLog
+++ b/cpukit/score/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* include/rtems/system.h: Remove targopts.h.
+
 2002-04-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* include/rtems/system.h: Add the sparc to the target supporting
diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h
index 8495206d98..92b05c340c 100644
--- a/cpukit/score/include/rtems/system.h
+++ b/cpukit/score/include/rtems/system.h
@@ -22,7 +22,7 @@ extern "C" {
 #endif
 
 /*
- *  The target options include file defines all target dependent 
+ *  The cpu options include file defines all cpu dependent 
  *  parameters for this build of RTEMS.  It must be included
  *  first so the basic macro definitions are in place.
  */
@@ -30,20 +30,6 @@ extern "C" {
 #include <rtems/score/cpuopts.h>
 
 /*
- * FIXME: No port should have to include targopts.h
- *
- *  Most cpus are ready to apply only cpuopts.h but these ports
- *  unfortunately still need targopts.h.  This means these ports
- *  are not ready to be built multilib yet. 
- */
-
-#if !defined(RTEMS_MULTILIBS)
-#if defined(__PPC__)
-#include <rtems/score/targopts.h>
-#endif
-#endif
-
-/*
  *  The following ensures that all data is declared in the space
  *  of the initialization routine for either the Initialization Manager
  *  or the initialization file for the appropriate API.  It is