diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-05-15 16:44:05 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-05-15 16:44:05 +0200 |
| commit | 768d4af538e6d1fbc3f3342d6179427fa3e22bfe (patch) | |
| tree | 88b33e595162cfcc6e337a3ded520d5134da5592 /arch/arm/mach-mvf/mvf_fec.c | |
| parent | a0b49113b02cf13c3d5079f7f6ae1fcf63c9a953 (diff) | |
| parent | b2faeb5472fe71b505a103388b8a8540dbd47134 (diff) | |
Merge tag '3.0-vybrid-ts2.16' into colibri_vfColibri_VF_LinuxImageV2.2Beta1_20140603
3.0-vybrid-ts2.16
Conflicts:
drivers/tty/serial/mvf.c
Diffstat (limited to 'arch/arm/mach-mvf/mvf_fec.c')
| -rw-r--r-- | arch/arm/mach-mvf/mvf_fec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-mvf/mvf_fec.c b/arch/arm/mach-mvf/mvf_fec.c index 5cbed27ba9aa..0ded64ebed13 100644 --- a/arch/arm/mach-mvf/mvf_fec.c +++ b/arch/arm/mach-mvf/mvf_fec.c @@ -35,13 +35,13 @@ static int fec_get_mac_addr(unsigned char *mac) unsigned int value; value = readl(MVF_IO_ADDRESS(MVF_FEC_BASE_ADDR) + ENET_PALR); - mac[2] = value & 0xff; - mac[3] = (value >> 8) & 0xff; - mac[4] = (value >> 16) & 0xff; - mac[5] = (value >> 24) & 0xff; + mac[3] = value & 0xff; + mac[2] = (value >> 8) & 0xff; + mac[1] = (value >> 16) & 0xff; + mac[0] = (value >> 24) & 0xff; value = readl(MVF_IO_ADDRESS(MVF_FEC_BASE_ADDR) + ENET_PAUR); - mac[0] = (value >> 16) & 0xff; - mac[1] = (value >> 24) & 0xff; + mac[5] = (value >> 16) & 0xff; + mac[4] = (value >> 24) & 0xff; return 0; } |