diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-10 13:12:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-10 13:12:29 +0200 |
| commit | 7c224a03a79021ab12ce057964df9e679af5386d (patch) | |
| tree | 809dbf3bcb5978e7b1845eb4c46179f1c9405f0c /drivers/net/usb/dm9601.c | |
| parent | 5bdb7934ca4115a12c7d585c5a45312b1c36909b (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
| download | linux-7c224a03a79021ab12ce057964df9e679af5386d.tar.gz linux-7c224a03a79021ab12ce057964df9e679af5386d.tar.bz2 linux-7c224a03a79021ab12ce057964df9e679af5386d.zip | |
Merge commit 'v2.6.34-rc7' into oprofile
Merge reason: Update to Linus's latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/usb/dm9601.c')
| -rw-r--r-- | drivers/net/usb/dm9601.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 04b281002a76..5dfed9297b22 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c @@ -240,7 +240,7 @@ static int dm_write_shared_word(struct usbnet *dev, int phy, u8 reg, __le16 valu goto out; dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg); - dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1c : 0x14); + dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1a : 0x12); for (i = 0; i < DM_TIMEOUT; i++) { u8 tmp; |