diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-31 09:02:41 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-31 09:02:41 +0200 |
| commit | 695a29b768d549b8c2df7461bb28b2f271325ad3 (patch) | |
| tree | b8f0a5a0490aaa3b1c73a7737989927e7783fdfb /include | |
| parent | 09d318a8bb1444ec92e31cafcdba877eb9409e58 (diff) | |
| parent | 861931c30bdb0cfbecf6c4f944bd221be572f010 (diff) | |
| download | u-boot-imx-695a29b768d549b8c2df7461bb28b2f271325ad3.zip u-boot-imx-695a29b768d549b8c2df7461bb28b2f271325ad3.tar.gz u-boot-imx-695a29b768d549b8c2df7461bb28b2f271325ad3.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-avr32/io.h | 2 | ||||
| -rw-r--r-- | include/asm-avr32/sysreg.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-avr32/io.h b/include/asm-avr32/io.h index d030c26..06e52b1 100644 --- a/include/asm-avr32/io.h +++ b/include/asm-avr32/io.h @@ -22,6 +22,8 @@ #ifndef __ASM_AVR32_IO_H #define __ASM_AVR32_IO_H +#include <asm/types.h> + #ifdef __KERNEL__ /* diff --git a/include/asm-avr32/sysreg.h b/include/asm-avr32/sysreg.h index 72ad49e..4f69704 100644 --- a/include/asm-avr32/sysreg.h +++ b/include/asm-avr32/sysreg.h @@ -273,7 +273,9 @@ | SYSREG_BF(name,value)) /* Register access macros */ -#define sysreg_read(reg) __builtin_mfsr(SYSREG_##reg) -#define sysreg_write(reg, value) __builtin_mtsr(SYSREG_##reg, value) +#define sysreg_read(reg) \ + ((unsigned long)__builtin_mfsr(SYSREG_##reg)) +#define sysreg_write(reg, value) \ + __builtin_mtsr(SYSREG_##reg, value) #endif /* __ASM_AVR32_SYSREG_H__ */ |