diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-14 07:59:21 -0600 |
| commit | 9423a2e8dd362a271bfe194ec131062814557b95 (patch) | |
| tree | 6b10b2d69e5d81b6ff4cb2ba75693d8a65362d92 /hw/lan9118.c | |
| parent | da5361cc685c004d8bb4e7c5e7b3a52c7aca2c56 (diff) | |
| parent | 126c79133f77d1b0b7c3849899c6d5f83b2fd410 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
Diffstat (limited to 'hw/lan9118.c')
| -rw-r--r-- | hw/lan9118.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/lan9118.c b/hw/lan9118.c index ee8b2eab06..7e64c5dee3 100644 --- a/hw/lan9118.c +++ b/hw/lan9118.c @@ -697,7 +697,7 @@ static uint32_t do_phy_read(lan9118_state *s, int reg) return 0x0007; case 3: /* ID2 */ return 0xc0d1; - case 4: /* Auto-neg advertisment */ + case 4: /* Auto-neg advertisement */ return s->phy_advertise; case 5: /* Auto-neg Link Partner Ability */ return 0x0f71; @@ -731,7 +731,7 @@ static void do_phy_write(lan9118_state *s, int reg, uint32_t val) s->phy_status |= 0x0020; } break; - case 4: /* Auto-neg advertisment */ + case 4: /* Auto-neg advertisement */ s->phy_advertise = (val & 0x2d7f) | 0x80; break; /* TODO 17, 18, 27, 31 */ |