diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-26 02:11:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-26 02:11:25 -0400 |
| commit | 14eabf70c82cade5dbc71d2e913d533193a91785 (patch) | |
| tree | 53bdf1534f73c59fe8ae796f660cab541a20224c /drivers/net/atp.c | |
| parent | f49e1aa133c2c9b74b5dfddca8863609bbda9086 (diff) | |
| parent | 2f4489112896770d66dc2960f71174d69ee23004 (diff) | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/atp.c')
| -rw-r--r-- | drivers/net/atp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 62f09e59d9c4..3d4433358a36 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
| @@ -378,8 +378,8 @@ static void __init get_node_ID(struct net_device *dev) | |||
| 378 | sa_offset = 15; | 378 | sa_offset = 15; |
| 379 | 379 | ||
| 380 | for (i = 0; i < 3; i++) | 380 | for (i = 0; i < 3; i++) |
| 381 | ((u16 *)dev->dev_addr)[i] = | 381 | ((__be16 *)dev->dev_addr)[i] = |
| 382 | be16_to_cpu(eeprom_op(ioaddr, EE_READ(sa_offset + i))); | 382 | cpu_to_be16(eeprom_op(ioaddr, EE_READ(sa_offset + i))); |
| 383 | 383 | ||
| 384 | write_reg(ioaddr, CMR2, CMR2_NULL); | 384 | write_reg(ioaddr, CMR2, CMR2_NULL); |
| 385 | } | 385 | } |