From 0fd3092e02810483e41709133e3c89246c1359de Mon Sep 17 00:00:00 2001
From: Jennifer Averett <Jennifer.Averett@OARcorp.com>
Date: Fri, 6 May 2005 20:06:17 +0000
Subject: 2005-05-06	Jennifer Averett <jennifer.averett@oarcorp.com>

	* libchip/network/dec21140.c, libchip/network/elnk.c,
	libchip/network/if_fxp.c: Moved irq.h to bsp subdirectory.
---
 c/src/ChangeLog                  | 5 +++++
 c/src/libchip/network/dec21140.c | 5 -----
 c/src/libchip/network/elnk.c     | 7 +------
 c/src/libchip/network/if_fxp.c   | 2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'c/src')

diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index f7fa5bab41..b873366138 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-06      Jennifer Averett <jennifer.averett@oarcorp.com>
+
+        * libchip/network/dec21140.c, libchip/network/elnk.c,
+        libchip/network/if_fxp.c: Moved irq.h to bsp subdirectory.
+
 2005-05-04      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * libchip/network/dec21140.c, libchip/network/elnk.c: Consolidation
diff --git a/c/src/libchip/network/dec21140.c b/c/src/libchip/network/dec21140.c
index 4387ad38b6..74c4785ce5 100644
--- a/c/src/libchip/network/dec21140.c
+++ b/c/src/libchip/network/dec21140.c
@@ -79,12 +79,7 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#if defined(__i386__)
-#include <irq.h>
-#endif
-#if defined(__PPC__)
 #include <bsp/irq.h>
-#endif
 
 #ifdef malloc
 #undef malloc
diff --git a/c/src/libchip/network/elnk.c b/c/src/libchip/network/elnk.c
index 54ac089f76..4f3066924f 100644
--- a/c/src/libchip/network/elnk.c
+++ b/c/src/libchip/network/elnk.c
@@ -110,16 +110,11 @@
 
 #include "if_media.h"
 #include "mii.h"
+#include <bsp/irq.h>
 
 #if defined(__i386__)
-#include <irq.h>
-
 #define IO_MASK   0x3
 #define MEM_MASK  0xF
-
-#endif
-#if defined(__PPC__)
-#include <bsp/irq.h>
 #endif
 
 #ifdef malloc
diff --git a/c/src/libchip/network/if_fxp.c b/c/src/libchip/network/if_fxp.c
index 0a0562b0e8..71f2200461 100644
--- a/c/src/libchip/network/if_fxp.c
+++ b/c/src/libchip/network/if_fxp.c
@@ -76,7 +76,7 @@
 #include <sys/systm.h>
 #include <bsp.h>
 #include <pcibios.h>
-#include <irq.h>
+#include <bsp/irq.h>
 #include <rtems/pci.h>
 
 #ifdef NS
-- 
cgit v1.2.3