From 2e43e6ce3dfbc4655e13ab6f2cab1dd0cb2a2675 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 28 Sep 2009 15:41:43 +0000
Subject: 2009-09-28	Joel Sherrill <joel.sherrill@OARcorp.com>

	* network/if_100MHz/GT64260eth.c, network/if_1GHz/if_wm.c: Do not
	include <sys/queue.h>. It conflicts with one from network stack.
---
 c/src/lib/libbsp/powerpc/mvme5500/ChangeLog                      | 5 +++++
 c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c | 2 +-
 c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c        | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
index ccdd1ca015..60edfc90dc 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme5500/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-28	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* network/if_100MHz/GT64260eth.c, network/if_1GHz/if_wm.c: Do not
+	include <sys/queue.h>. It conflicts with one from network stack.
+
 2009-09-15	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* configure.ac: Remove RTEMS_BSP_BOOTCARD_OPTIONS.
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c
index 3ed43638b1..feec946c92 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_100MHz/GT64260eth.c
@@ -42,7 +42,7 @@
 
 #include <rtems/rtems/types.h>
 
-#include <sys/queue.h>
+/* #include <sys/queue.h> */
 
 #include <sys/ioctl.h>
 #include <sys/socket.h>
diff --git a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
index 1224ddaa4f..7288fe8c92 100644
--- a/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
+++ b/c/src/lib/libbsp/powerpc/mvme5500/network/if_1GHz/if_wm.c
@@ -58,7 +58,7 @@
 #include <rtems/rtems/types.h>
 #include <rtems/score/cpu.h>
 
-#include <sys/queue.h>
+/* #include <sys/queue.h> */
 
 #include <sys/ioctl.h>
 #include <sys/socket.h>
@@ -1019,7 +1019,7 @@ static int i82544EI_init_hw(struct wm_softc *sc)
 
 #if 0
   /* Use MOTLoad default
-  /*
+   *
    * Set up flow-control parameters.
    */
   CSR_WRITE(sc,WMREG_FCAL, FCAL_CONST);/* same as MOTLOAD 0x00c28001 */
-- 
cgit v1.2.3