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.
This commit is contained in:
Joel Sherrill
2009-09-28 15:41:43 +00:00
parent 9a393997d1
commit 2e43e6ce3d
3 changed files with 8 additions and 3 deletions

View File

@@ -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.

View File

@@ -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>

View File

@@ -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 */