Merge branch 'for-next' into for-linus

[sfrench/cifs-2.6.git] / drivers / net / cxgb3 / sge.c

diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 78e265b484b64c20baf6d3ab951b3db176415d76..67e61b2a8c42332b2b2d678d560111fb134a203c 100644 (file)
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -197,13 +197,13 @@ static inline void refill_rspq(struct adapter *adapter,
 /**
  *     need_skb_unmap - does the platform need unmapping of sk_buffs?
  *
- *     Returns true if the platfrom needs sk_buff unmapping.  The compiler
+ *     Returns true if the platform needs sk_buff unmapping.  The compiler
  *     optimizes away unecessary code if this returns true.
  */
 static inline int need_skb_unmap(void)
 {
        /*
-        * This structure is used to tell if the platfrom needs buffer
+        * This structure is used to tell if the platform needs buffer
         * unmapping by checking if DECLARE_PCI_UNMAP_ADDR defines anything.
         */
        struct dummy {