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/e1000_hw.h | |
| parent | da5361cc685c004d8bb4e7c5e7b3a52c7aca2c56 (diff) | |
| parent | 126c79133f77d1b0b7c3849899c6d5f83b2fd410 (diff) | |
| download | hqemu-9423a2e8dd362a271bfe194ec131062814557b95.zip hqemu-9423a2e8dd362a271bfe194ec131062814557b95.tar.gz | |
Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
Diffstat (limited to 'hw/e1000_hw.h')
| -rw-r--r-- | hw/e1000_hw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/e1000_hw.h b/hw/e1000_hw.h index 2e341ac..9e29af8 100644 --- a/hw/e1000_hw.h +++ b/hw/e1000_hw.h @@ -295,7 +295,7 @@ #define E1000_KUMCTRLSTA 0x00034 /* MAC-PHY interface - RW */ #define E1000_MDPHYA 0x0003C /* PHY address - RW */ -#define E1000_MANC2H 0x05860 /* Managment Control To Host - RW */ +#define E1000_MANC2H 0x05860 /* Management Control To Host - RW */ #define E1000_SW_FW_SYNC 0x05B5C /* Software-Firmware Synchronization - RW */ #define E1000_GCR 0x05B00 /* PCI-Ex Control */ |
