diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 13:12:33 -0500 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-11 13:12:33 -0500 |
| commit | e59d969f441fb8e25b30125bdf201153adc5a7e3 (patch) | |
| tree | e18250fbc1bc9e2ca864292d2390325f8ac84c80 /arch/arm/mach-at91/at91rm9200.c | |
| parent | 4ddb1c295752252f61670e35c791bf16e58bbce6 (diff) | |
| parent | f6f94f6660dbe34039e5c86a46c7845589e7ee0c (diff) | |
Merge branch 'at91' into devel
Diffstat (limited to 'arch/arm/mach-at91/at91rm9200.c')
| -rw-r--r-- | arch/arm/mach-at91/at91rm9200.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 5269825194a..a3e4710d735 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c | |||
| @@ -361,10 +361,10 @@ static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = { | |||
| 361 | 0 /* Advanced Interrupt Controller (IRQ6) */ | 361 | 0 /* Advanced Interrupt Controller (IRQ6) */ |
| 362 | }; | 362 | }; |
| 363 | 363 | ||
| 364 | struct at91_init_soc __initdata at91rm9200_soc = { | 364 | AT91_SOC_START(rm9200) |
| 365 | .map_io = at91rm9200_map_io, | 365 | .map_io = at91rm9200_map_io, |
| 366 | .default_irq_priority = at91rm9200_default_irq_priority, | 366 | .default_irq_priority = at91rm9200_default_irq_priority, |
| 367 | .ioremap_registers = at91rm9200_ioremap_registers, | 367 | .ioremap_registers = at91rm9200_ioremap_registers, |
| 368 | .register_clocks = at91rm9200_register_clocks, | 368 | .register_clocks = at91rm9200_register_clocks, |
| 369 | .init = at91rm9200_initialize, | 369 | .init = at91rm9200_initialize, |
| 370 | }; | 370 | AT91_SOC_END |