diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-19 11:50:25 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-19 11:50:25 -0700 |
| commit | a71efd61db6368629b1b3e403076c957207f79bd (patch) | |
| tree | 76819c82b72f9f6eb4accf658f66d6b565bc3717 /arch/arm/mach-at91/at91sam9g45.c | |
| parent | cd4cb1a7dfd7d90fa1de8b51222d96efceb6f3ef (diff) | |
| parent | 471c9e786596c4f028c67c7e9de0703b49cab2a9 (diff) | |
Merge branch 'at91/soc' into late/cleanup
* at91/soc:
ARM: at91: add defconfig for SAMA5
ARM: at91: dt: add device tree files for SAMA5D3 family
ARM: at91: introduce SAMA5 support
ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7 arch
ARM: at91: add AT91_SAM9_TIME entry to select at91sam926x_time.c compilation
ARM: at91: change name template in AT91_SOC_START macro
ARM: at91: renamme rm9200 dt file
ARM: at91: rename board-dt to more specific name board-dt-sam9
ARM: at91: move non DT Kconfig to Kconfig.non_dt
Diffstat (limited to 'arch/arm/mach-at91/at91sam9g45.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9g45.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c index d3addee43d8d..4fcbe7b5b58d 100644 --- a/arch/arm/mach-at91/at91sam9g45.c +++ b/arch/arm/mach-at91/at91sam9g45.c @@ -418,7 +418,7 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = { 0, /* Advanced Interrupt Controller (IRQ0) */ }; -AT91_SOC_START(sam9g45) +AT91_SOC_START(at91sam9g45) .map_io = at91sam9g45_map_io, .default_irq_priority = at91sam9g45_default_irq_priority, .ioremap_registers = at91sam9g45_ioremap_registers, |