projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.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
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
arm
/
mach-at91
/
at91sam9260.c
diff --git
a/arch/arm/mach-at91/at91sam9260.c
b/arch/arm/mach-at91/at91sam9260.c
index 44199bc2c6657003f32fd459f76548a50b449662..a8ce24538da62ea8c5dd9fa1d89a2214508ae996 100644
(file)
--- a/
arch/arm/mach-at91/at91sam9260.c
+++ b/
arch/arm/mach-at91/at91sam9260.c
@@
-397,7
+397,7
@@
static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
0, /* Advanced Interrupt Controller */
};
-AT91_SOC_START(sam9260)
+AT91_SOC_START(
at91
sam9260)
.map_io = at91sam9260_map_io,
.default_irq_priority = at91sam9260_default_irq_priority,
.ioremap_registers = at91sam9260_ioremap_registers,