projects
/
kernel
/
kernel-generic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[kernel/kernel-generic.git]
/
arch
/
arm
/
mach-at91
/
at91rm9200.c
diff --git
a/arch/arm/mach-at91/at91rm9200.c
b/arch/arm/mach-at91/at91rm9200.c
index
36b05fc
..
d193a40
100644
(file)
--- a/
arch/arm/mach-at91/at91rm9200.c
+++ b/
arch/arm/mach-at91/at91rm9200.c
@@
-385,7
+385,7
@@
static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
0 /* Advanced Interrupt Controller (IRQ6) */
};
-AT91_SOC_START(rm9200)
+AT91_SOC_START(
at91
rm9200)
.map_io = at91rm9200_map_io,
.default_irq_priority = at91rm9200_default_irq_priority,
.ioremap_registers = at91rm9200_ioremap_registers,