diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/net/sungem.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/net/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index c1a344829b54..d3be735c4719 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -1150,7 +1150,7 @@ static void gem_pcs_reinit_adv(struct gem *gp) | |||
| 1150 | val &= ~(PCS_CFG_ENABLE | PCS_CFG_TO); | 1150 | val &= ~(PCS_CFG_ENABLE | PCS_CFG_TO); |
| 1151 | writel(val, gp->regs + PCS_CFG); | 1151 | writel(val, gp->regs + PCS_CFG); |
| 1152 | 1152 | ||
| 1153 | /* Advertise all capabilities except assymetric | 1153 | /* Advertise all capabilities except asymmetric |
| 1154 | * pause. | 1154 | * pause. |
| 1155 | */ | 1155 | */ |
| 1156 | val = readl(gp->regs + PCS_MIIADV); | 1156 | val = readl(gp->regs + PCS_MIIADV); |