diff options
| author | John Sonnenschein <johns@joyent.com> | 2011-12-15 22:43:18 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2011-12-15 22:43:18 +0000 |
| commit | c4aa323138d7633d35c7cbf4123aa100970a91f9 (patch) | |
| tree | 596fe3d0c3374835bf0e2e1d31e3ea8f3659422a /usr/src/grub | |
| parent | 73c531dd5303a633bcaaf609c6eeb2554096b478 (diff) | |
| parent | f9b22ee9e48b04a9ef01426e92a13c5b164c0763 (diff) | |
| download | illumos-joyent-c4aa323138d7633d35c7cbf4123aa100970a91f9.tar.gz | |
Merge branch 'master' into gcc4
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) |