diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-12 03:05:35 -0400 |
| commit | 278554bd6579206921f5d8a523649a7a57f8850d (patch) | |
| tree | 4e6c527daf0910e455b3aa72e2c96b0479e430be /drivers/net/fec.c | |
| parent | 5a147e8bf982f9dd414c1dd751fe02c1942506b2 (diff) | |
| parent | cea0d767c29669bf89f86e4aee46ef462d2ebae8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ar9170/usb.c
drivers/scsi/iscsi_tcp.c
net/ipv4/ipmr.c
Diffstat (limited to 'drivers/net/fec.c')
| -rw-r--r-- | drivers/net/fec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 47da51957803..42d9ac9ba395 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c | |||
| @@ -1031,7 +1031,7 @@ fec_set_mac_address(struct net_device *dev, void *p) | |||
| 1031 | (dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24), | 1031 | (dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24), |
| 1032 | fep->hwp + FEC_ADDR_LOW); | 1032 | fep->hwp + FEC_ADDR_LOW); |
| 1033 | writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24), | 1033 | writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24), |
| 1034 | fep + FEC_ADDR_HIGH); | 1034 | fep->hwp + FEC_ADDR_HIGH); |
| 1035 | return 0; | 1035 | return 0; |
| 1036 | } | 1036 | } |
| 1037 | 1037 | ||