diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:07:23 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:07:23 -0400 |
| commit | df760137ad3cbfa15ceed42478f81bff01b6e799 (patch) | |
| tree | be939c9d11094858d74141a4c62cb23f477754d8 /drivers/net/usb/dm9601.c | |
| parent | 754b8e653412106ff613f4750b197f807fcd8347 (diff) | |
| parent | de997718b64df2f766736f23f8557da450b83a25 (diff) | |
Merge branch 'omap-boards' into omap-for-linus
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 | |||
| 240 | goto out; | 240 | goto out; |
| 241 | 241 | ||
| 242 | dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg); | 242 | dm_write_reg(dev, DM_SHARED_ADDR, phy ? (reg | 0x40) : reg); |
| 243 | dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1c : 0x14); | 243 | dm_write_reg(dev, DM_SHARED_CTRL, phy ? 0x1a : 0x12); |
| 244 | 244 | ||
| 245 | for (i = 0; i < DM_TIMEOUT; i++) { | 245 | for (i = 0; i < DM_TIMEOUT; i++) { |
| 246 | u8 tmp; | 246 | u8 tmp; |