Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[u-boot] / arch / avr32 / cpu / hsdramc1.h

diff --git a/arch/avr32/cpu/hsdramc1.h b/arch/avr32/cpu/hsdramc1.h
index 305d2cb5d39a6b9ebd9ccb1923636a1f533cdb00..e18e074a7abfd683e76efc8753a4e6b78d5bdb77 100644 (file)
--- a/arch/avr32/cpu/hsdramc1.h
+++ b/arch/avr32/cpu/hsdramc1.h
@@ -136,8 +136,8 @@
 
 /* Register access macros */
 #define hsdramc1_readl(reg)                                    \
-       readl((void *)HSDRAMC_BASE + HSDRAMC1_##reg)
+       readl((void *)ATMEL_BASE_HSDRAMC + HSDRAMC1_##reg)
 #define hsdramc1_writel(reg,value)                             \
-       writel((value), (void *)HSDRAMC_BASE + HSDRAMC1_##reg)
+       writel((value), (void *)ATMEL_BASE_HSDRAMC + HSDRAMC1_##reg)
 
 #endif /* __ASM_AVR32_HSDRAMC1_H__ */