Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / net / e1000 / e1000_hw.h

diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h
index c70b23d..5c9a840 100644 (file)
--- a/drivers/net/e1000/e1000_hw.h
+++ b/drivers/net/e1000/e1000_hw.h
@@ -1026,7 +1026,7 @@ extern void __iomem *ce4100_gbe_mdio_base_virt;
 
 #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 */