summaryrefslogtreecommitdiffstats
path: root/src/drivers/net/sis900.c
diff options
context:
space:
mode:
authorGeorge Baum2005-05-23 21:30:37 +0200
committerGeorge Baum2005-05-23 21:30:37 +0200
commitc4c05bbbf7180baaeb95e6177a7089c553b42d3e (patch)
tree5e1139be5c6bd84ae741374ec0ed99ba50241c2f /src/drivers/net/sis900.c
parentSeparated out the Etherboot-specific parts of the old pxe.h header. (diff)
downloadipxe-c4c05bbbf7180baaeb95e6177a7089c553b42d3e.tar.gz
ipxe-c4c05bbbf7180baaeb95e6177a7089c553b42d3e.tar.xz
ipxe-c4c05bbbf7180baaeb95e6177a7089c553b42d3e.zip
the uncontroversal gcc 4.0 compilation fixes
Diffstat (limited to 'src/drivers/net/sis900.c')
-rw-r--r--src/drivers/net/sis900.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c
index b5ba3f08..c2cb94e8 100644
--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -1097,7 +1097,7 @@ sis900_transmit(struct nic *nic,
const char *p) /* Packet */
{
u32 to, nstype;
- u32 tx_status;
+ volatile u32 tx_status;
/* Stop the transmitter */
outl(TxDIS | inl(ioaddr + cr), ioaddr + cr);
@@ -1136,7 +1136,7 @@ sis900_transmit(struct nic *nic,
to = currticks() + TX_TIMEOUT;
- while ((((volatile u32) tx_status=txd.cmdsts) & OWN) && (currticks() < to))
+ while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to))
/* wait */ ;
if (currticks() >= to) {