diff options
author | John Sonnenschein <johns@joyent.com> | 2011-12-15 22:20:12 +0000 |
---|---|---|
committer | John Sonnenschein <johns@joyent.com> | 2011-12-15 22:20:12 +0000 |
commit | f9b22ee9e48b04a9ef01426e92a13c5b164c0763 (patch) | |
tree | 2bf5259c9bbf8042d3bf39ca737b05a1801d8e4b /usr/src/grub | |
parent | df5fe3d22e102695087d81e2376f4037fc56e13b (diff) | |
parent | 3abb112f8485b33b6b9b52b340bede0a333c10bf (diff) | |
download | illumos-joyent-f9b22ee9e48b04a9ef01426e92a13c5b164c0763.tar.gz |
[OS-714] Illumos merge
Diffstat (limited to 'usr/src/grub')
-rw-r--r-- | usr/src/grub/grub-0.97/netboot/pcnet32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/grub/grub-0.97/netboot/pcnet32.c b/usr/src/grub/grub-0.97/netboot/pcnet32.c index f7bd1f6d10..c7beb14012 100644 --- a/usr/src/grub/grub-0.97/netboot/pcnet32.c +++ b/usr/src/grub/grub-0.97/netboot/pcnet32.c @@ -479,7 +479,7 @@ static void pcnet32_reset(struct nic *nic) lp->a.write_csr(ioaddr, 124, val); if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) { - val = lp->a.read_bcr(ioaddr, 32) & ~0x38; /* disable Auto Negotiation, set 10Mpbs, HD */ + val = lp->a.read_bcr(ioaddr, 32) & ~0x38; /* disable Auto Negotiation, set 10Mbps, HD */ if (lp->options & PCNET32_PORT_FD) val |= 0x10; if (lp->options & PCNET32_PORT_100) |