summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-04-18 21:01:20 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-04-18 21:01:20 +0000
commit7c4ef9cd7a2c75f192e553b3e3cb070d9c14cb5b (patch)
treee16fbbe8bad91678c9965fb6b4ea85ed306358da
parent2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-7c4ef9cd7a2c75f192e553b3e3cb070d9c14cb5b.tar.bz2
2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* network/dec21140.c: Reflect changes to powerpc's rtems/score/cpu.h. Use __PPC__ for gcc-3.x compliance.
-rw-r--r--c/src/libchip/ChangeLog5
-rw-r--r--c/src/libchip/network/dec21140.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog
index a2c9259277..12aa20fe03 100644
--- a/c/src/libchip/ChangeLog
+++ b/c/src/libchip/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * network/dec21140.c: Reflect changes to powerpc's
+ rtems/score/cpu.h. Use __PPC__ for gcc-3.x compliance.
+
2002-04-11 Chris Johns <ccj@acm.org>
* network/rtems_bsdnet.h: To address PR59, added the drv_ctrl driver
diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c
index 7b5af45b1d..172b87891a 100644
--- a/c/src/libchip/network/dec21140.c
+++ b/c/src/libchip/network/dec21140.c
@@ -39,7 +39,7 @@
#define DEC21140_SUPPORTED
#endif
-#if defined(__PPC) && (defined(mpc604) || defined(mpc750))
+#if defined(__PPC__) && (defined(mpc604) || defined(mpc750))
#define DEC21140_SUPPORTED
#endif
@@ -48,7 +48,7 @@
#if defined(__i386__)
#include <pcibios.h>
#endif
-#if defined(__PPC)
+#if defined(__PPC__)
#include <bsp/pci.h>
#include <libcpu/byteorder.h>
#include <libcpu/io.h>
@@ -60,8 +60,6 @@
#include <rtems/error.h>
#include <rtems/rtems_bsdnet.h>
-#include <libcpu/cpu.h>
-
#include <sys/param.h>
#include <sys/mbuf.h>