diff options
author | Wolfgang Denk <wd@denx.de> | 2010-10-13 20:59:47 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-10-13 20:59:47 +0200 |
commit | e1b4c57096b87b4ada56df4154d9acee6a59141f (patch) | |
tree | 4d1ab61fd347a63410bcffc1ac2d85beeb247058 /arch/arm/include/asm/arch-at91/at91_emac.h | |
parent | da61f6c45ad4a126bf0a9a8184fadc13073ecb3f (diff) | |
parent | 89bca0ab697fc75160dd0d685d7cb2ed26609a6d (diff) | |
download | u-boot-imx-e1b4c57096b87b4ada56df4154d9acee6a59141f.zip u-boot-imx-e1b4c57096b87b4ada56df4154d9acee6a59141f.tar.gz u-boot-imx-e1b4c57096b87b4ada56df4154d9acee6a59141f.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/include/asm/arch-at91/at91_emac.h')
-rw-r--r-- | arch/arm/include/asm/arch-at91/at91_emac.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-at91/at91_emac.h b/arch/arm/include/asm/arch-at91/at91_emac.h index 45ae333..0e2ff78 100644 --- a/arch/arm/include/asm/arch-at91/at91_emac.h +++ b/arch/arm/include/asm/arch-at91/at91_emac.h @@ -61,7 +61,7 @@ typedef struct at91_emac { u32 reserved2[3]; u32 hsh; u32 hsl; - u32 sh1l; + u32 sa1l; u32 sa1h; u32 sa2l; u32 sa2h; |