diff options
| author | Michael Brown | 2008-11-19 03:22:56 +0100 |
|---|---|---|
| committer | Michael Brown | 2008-11-19 20:15:44 +0100 |
| commit | b59e0cc56eb6d5f3b6f934722931f6919309ffd2 (patch) | |
| tree | 0e74a023207232f7911e1ccb9abdf6454dea70f5 /src/drivers/net/tg3.c | |
| parent | [libgcc] Make __libgcc architecture-specific (diff) | |
| download | ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.gz ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.tar.xz ipxe-b59e0cc56eb6d5f3b6f934722931f6919309ffd2.zip | |
[i386] Change [u]int32_t to [unsigned] int, rather than [unsigned] long
This brings us in to line with Linux definitions, and also simplifies
adding x86_64 support since both platforms have 2-byte shorts, 4-byte
ints and 8-byte long longs.
Diffstat (limited to 'src/drivers/net/tg3.c')
| -rw-r--r-- | src/drivers/net/tg3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c index bcb9dda78..14093bb2a 100644 --- a/src/drivers/net/tg3.c +++ b/src/drivers/net/tg3.c @@ -1460,7 +1460,7 @@ static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, uint32_t enable_bit } if (i == MAX_WAIT_CNT) { - printf( "tg3_stop_block timed out, ofs=%#lx enable_bit=%3lx\n", + printf( "tg3_stop_block timed out, ofs=%#lx enable_bit=%3x\n", ofs, enable_bit ); return -ENODEV; } @@ -1665,7 +1665,7 @@ static int tg3_restart_fw(struct tg3 *tp, uint32_t state) if (i >= 100000 && !(tp->tg3_flags2 & TG3_FLG2_SUN_5704) && !(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787)) { - printf ( "Firmware will not restart magic=%#lx\n", + printf ( "Firmware will not restart magic=%#x\n", val ); return -ENODEV; } |
