aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-09-24 14:07:23 +0200
committerJiri Kosina <jkosina@suse.cz>2010-09-24 14:07:23 +0200
commit45798c28b43d06d371df2e26e4a143c6f1428c6d (patch)
treebeff29cc537c493e09b26b01eab4d95ee5daace8
parentida: document IDA_BITMAP_LONGS calculation (diff)
downloadlinux-dev-45798c28b43d06d371df2e26e4a143c6f1428c6d.tar.xz
linux-dev-45798c28b43d06d371df2e26e4a143c6f1428c6d.zip
Revert "Fix typo: configuation => configuration" partially
This is a partial revert of 0b1974de66f ("Fix typo: configuation => configuration") as this hunk is removed in net-next. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/net/bnx2x/bnx2x_link.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bnx2x/bnx2x_link.c b/drivers/net/bnx2x/bnx2x_link.c
index c2146e78d6b1..0383e3066313 100644
--- a/drivers/net/bnx2x/bnx2x_link.c
+++ b/drivers/net/bnx2x/bnx2x_link.c
@@ -3735,7 +3735,7 @@ static u8 bnx2x_ext_phy_init(struct link_params *params, struct link_vars *vars)
/* Clear first 3 bits of the control */
val &= ~0x7;
/* Set control bits according to
- configuration */
+ configuation */
val |= (params->xgxs_config_rx[i] &
0x7);
DP(NETIF_MSG_LINK, "Setting RX"