Fix merge problems

[platform/kernel/u-boot.git] / include / asm-avr32 / sysreg.h

diff --git a/include/asm-avr32/sysreg.h b/include/asm-avr32/sysreg.h
index 72ad49e..4f69704 100644 (file)
--- 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__ */