diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-10-28 00:14:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-28 00:14:16 +0200 |
| commit | 606a76f8ef479e42ae4d06f8f3ce87e9a1c72acf (patch) | |
| tree | 0308f6a10f937f8603f73c07568b68bcd6208b49 /arch | |
| parent | 88a85fb9f3578f513d7053ac9a3f1ff7521b2771 (diff) | |
| parent | 1fbd0c36daeb2340210bbd68ee2f62f26a8bdfa0 (diff) | |
| download | u-boot-imx-606a76f8ef479e42ae4d06f8f3ce87e9a1c72acf.zip u-boot-imx-606a76f8ef479e42ae4d06f8f3ce87e9a1c72acf.tar.gz u-boot-imx-606a76f8ef479e42ae4d06f8f3ce87e9a1c72acf.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
* 'master' of git://git.denx.de/u-boot-microblaze:
microblaze: Fix strict-aliasing rules for in_be32
microblaze: Wire up axi_ethernet driver initialization
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/microblaze/include/asm/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index 7e190d1..584cbce 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h @@ -25,7 +25,7 @@ #define readw(addr) \ ({ unsigned short __v = (*(volatile unsigned short *) (addr)); __v; }) #define readl(addr) \ - ({ unsigned long __v = (*(volatile unsigned long *) (addr)); __v; }) + ({ unsigned int __v = (*(volatile unsigned int *) (addr)); __v; }) #define writeb(b, addr) \ (void)((*(volatile unsigned char *) (addr)) = (b)) |