diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-11 10:24:22 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-11 10:24:22 +0200 |
| commit | ddf71e4cfffb4792445d3473cfc9326d07e6557c (patch) | |
| tree | 304de15eacb23a55a1eae6e2fc3c9d3726d8290f /arch/arm/include/asm | |
| parent | e67f46286440a53fb1d693152667ea3b1a6b3060 (diff) | |
| parent | c8f6d84d10d324e0b0462e09629f210b046e1018 (diff) | |
| download | u-boot-imx-ddf71e4cfffb4792445d3473cfc9326d07e6557c.zip u-boot-imx-ddf71e4cfffb4792445d3473cfc9326d07e6557c.tar.gz u-boot-imx-ddf71e4cfffb4792445d3473cfc9326d07e6557c.tar.bz2 | |
Merge branch 'at91' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'arch/arm/include/asm')
| -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; |