diff options
| author |  David S. Miller <davem@davemloft.net>
| 2010-05-03 15:45:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2010-05-03 15:45:52 -0700 |
| commit | 0f7ca5917e989c4f77db3e97f92badaf3266d4dc (patch) | |
| tree | 0f29c4d45870c7d6317ff768c751aebf0948098a /drivers/net/usb/dm9601.c | |
| parent | unix/garbage: kill copy of the skb queue walker (diff) | |
| parent | drivers/net/phy: micrel phy driver (diff) | |
| download | linux-0f7ca5917e989c4f77db3e97f92badaf3266d4dc.tar.gz linux-0f7ca5917e989c4f77db3e97f92badaf3266d4dc.tar.bz2 linux-0f7ca5917e989c4f77db3e97f92badaf3266d4dc.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 291add255246..47634b617107 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; |