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/ks8842.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/ks8842.c')
| -rw-r--r-- | drivers/net/ks8842.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ks8842.c b/drivers/net/ks8842.c index efd44afeae83..f0d8346d0fa5 100644 --- a/drivers/net/ks8842.c +++ b/drivers/net/ks8842.c | |||
| @@ -321,7 +321,7 @@ static void ks8842_reset_hw(struct ks8842_adapter *adapter) | |||
| 321 | /* RX 2 kb high watermark */ | 321 | /* RX 2 kb high watermark */ |
| 322 | ks8842_write16(adapter, 0, 0x1000, REG_QRFCR); | 322 | ks8842_write16(adapter, 0, 0x1000, REG_QRFCR); |
| 323 | 323 | ||
| 324 | /* aggresive back off in half duplex */ | 324 | /* aggressive back off in half duplex */ |
| 325 | ks8842_enable_bits(adapter, 32, 1 << 8, REG_SGCR1); | 325 | ks8842_enable_bits(adapter, 32, 1 << 8, REG_SGCR1); |
| 326 | 326 | ||
| 327 | /* enable no excessive collison drop */ | 327 | /* enable no excessive collison drop */ |