diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9rl.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9rl.c | 9 | 
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c index 0788adb1b53..b83098c1db1 100644 --- a/arch/arm/mach-at91/at91sam9rl.c +++ b/arch/arm/mach-at91/at91sam9rl.c @@ -16,6 +16,7 @@  #include <asm/mach/arch.h>  #include <asm/mach/map.h>  #include <mach/cpu.h> +#include <mach/at91_dbgu.h>  #include <mach/at91sam9rl.h>  #include <mach/at91_pmc.h>  #include <mach/at91_rstc.h> @@ -281,11 +282,9 @@ static void at91sam9rl_poweroff(void)  static void __init at91sam9rl_map_io(void)  { -	unsigned long cidr, sram_size; +	unsigned long sram_size; -	cidr = dbgu_readl(AT91_DBGU, CIDR); - -	switch (cidr & AT91_CIDR_SRAMSIZ) { +	switch (at91_soc_initdata.cidr & AT91_CIDR_SRAMSIZ) {  		case AT91_CIDR_SRAMSIZ_32K:  			sram_size = 2 * SZ_16K;  			break; @@ -359,7 +358,7 @@ static unsigned int at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = {  	0,	/* Advanced Interrupt Controller */  }; -struct at91_soc __initdata at91sam9rl_soc = { +struct at91_init_soc __initdata at91sam9rl_soc = {  	.map_io = at91sam9rl_map_io,  	.default_irq_priority = at91sam9rl_default_irq_priority,  	.init = at91sam9rl_initialize,  |