Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

[linux-2.6-block.git] / drivers / staging / netlogic / xlr_net.c

diff --git a/drivers/staging/netlogic/xlr_net.c b/drivers/staging/netlogic/xlr_net.c
index 5ecb3e6a5bb30917c5d94780f4c226a55ade164b..e8aae09d16242b9fe08fc0ddec58372a67d9709d 100644 (file)
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -788,7 +788,7 @@ void xlr_set_gmac_speed(struct xlr_net_priv *priv)
                        xlr_nae_wreg(priv->base_addr, R_MAC_CONFIG_2, 0x7117);
                        priv->phy_speed = speed;
                }
-               /* Set SGMII speed in Interface controll reg */
+               /* Set SGMII speed in Interface control reg */
                if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
                        if (speed == SPEED_10)
                                xlr_nae_wreg(priv->base_addr,