summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/at91rm9200.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2012-11-11 19:12:33 +0100
committerLinus Walleij <linus.walleij@linaro.org>2012-11-11 19:12:33 +0100
commite59d969f441fb8e25b30125bdf201153adc5a7e3 (patch)
treee18250fbc1bc9e2ca864292d2390325f8ac84c80 /arch/arm/mach-at91/at91rm9200.c
parent4ddb1c295752252f61670e35c791bf16e58bbce6 (diff)
parentf6f94f6660dbe34039e5c86a46c7845589e7ee0c (diff)
downloadlinux-e59d969f441fb8e25b30125bdf201153adc5a7e3.tar.gz
linux-e59d969f441fb8e25b30125bdf201153adc5a7e3.tar.bz2
linux-e59d969f441fb8e25b30125bdf201153adc5a7e3.zip
Merge branch 'at91' into devel
Diffstat (limited to 'arch/arm/mach-at91/at91rm9200.c')
-rw-r--r--arch/arm/mach-at91/at91rm9200.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 5269825194a8..a3e4710d7352 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 = {
0 /* Advanced Interrupt Controller (IRQ6) */
};
-struct at91_init_soc __initdata at91rm9200_soc = {
+AT91_SOC_START(rm9200)
.map_io = at91rm9200_map_io,
.default_irq_priority = at91rm9200_default_irq_priority,
.ioremap_registers = at91rm9200_ioremap_registers,
.register_clocks = at91rm9200_register_clocks,
.init = at91rm9200_initialize,
-};
+AT91_SOC_END