Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[mv-sheeva.git] / drivers / net / cxgb3 / t3_hw.c

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index ec8579a0a8083b433ce3e81312d43cbe6d74d9c0..d55db6b38e7b9a9297fdd2feec1e21deb02c0aae 100644 (file)
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -607,7 +607,7 @@ struct t3_vpd {
  *
  *     Read a 32-bit word from a location in VPD EEPROM using the card's PCI
  *     VPD ROM capability.  A zero is written to the flag bit when the
- *     addres is written to the control register.  The hardware device will
+ *     address is written to the control register.  The hardware device will
  *     set the flag to 1 when 4 bytes have been read into the data register.
  */
 int t3_seeprom_read(struct adapter *adapter, u32 addr, __le32 *data)